送货单生成条码时，物料、批号相同，合并数量生成条码；送货单ID改为前端页面获取

yusijie

2024-09-26 3180615984b64c0d7115ae4b202860542375ca9c

送货单生成条码时，物料、批号相同，合并数量生成条码；送货单ID改为前端页面获取

 WebAPI/Controllers/BarCodeController.cs

@@ -1388,6 +1388,59 @@
                return objjson;
            }
        }

        [Route("GetHBarCodeShowBillSub_Merge")]
        [HttpGet]
        /// <summary>
        /// 条码生成表体(物料，批次相同，合并数量)
        /// </summary>
        /// <param name="sMsg"></param>
        /// <returns></returns>
        public object GetHBarCodeShowBillSub_Merge(string HInterID)
        {
            try
            {
                DataSet ds;
                string s = "";
                string ShowItem = " * ";//显示的字段
                if (DBUtility.ClsPub.isLong(HInterID) == 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败,送货单内码为空";
                    objjson.data = null;
                    return objjson;
                }

                ds = oCn.RunProcReturn("Select * from h_v_SRM_Barcode_MergePOInStock where HInterID = " + HInterID, "h_v_SRM_Barcode_MergePOInStock");

                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败";
                    objjson.data = null;
                    return objjson;
                }
                else
                {
                    objjson.code = "0";
                    objjson.count = 10000;
                    objjson.Message = "获取成功";
                    objjson.data = ds.Tables[0];
                    return objjson;
                }
            }
            catch (Exception e)
            {
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "获取失败" + e.ToString();
                objjson.data = null;
                return objjson;
            }
        }

        /// <summary>
        /// 条码档案列表
        /// </summary>

 WebAPI/Controllers/POInStockController.cs

@@ -85,20 +85,24 @@
                    return objjson;
                }
                string HBillNo, HInnerBillNo, HDate;
                Int64 HInterID;
                HBillNo = DBUtility.ClsPub.CreateBillCode_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo, true);
                HInnerBillNo = DBUtility.ClsPub.CreateBillCode_SRMProd("777", ref DBUtility.ClsPub.sExeReturnInfo, true);//送货单号
                HDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
                HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
                //创建临时表
                DataTable dt = new DataTable();
                //创建表中的列
                dt.Columns.Add("HBillNo", typeof(string));//添加列
                dt.Columns.Add("HInnerBillNo", typeof(string));//添加列
                dt.Columns.Add("HDate", typeof(string));//添加列
                dt.Columns.Add("HInterID", typeof(Int64));//添加列
                DataRow row = dt.NewRow();
                //给列赋值
                row["HBillNo"] = HBillNo;
                row["HInnerBillNo"] = HInnerBillNo;
                row["HDate"] = HDate;
                row["HInterID"] = HInterID;
                //把有值的列添加到表
                dt.Rows.Add(row);
                //把表添加到dataset
@@ -323,7 +327,7 @@
                    oItem.HCurID = 1;
                    oItem.HExRate = 1;
                    oItem.HMainSourceInterID = oItem.HInterID;
                    oItem.HInterID = 0;
                    //oItem.HInterID = 0;
                    //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
                    if (FCusName.Contains("安瑞")) //系统参数  客户定制化名称     空白为通用
                    {
@@ -427,7 +431,7 @@
                //保存
                //保存完毕后处理
                bool bResult;
                if (oBill.omodel.HInterID == 0)
                if (oBill.omodel.HInterID != 0 && oBill.omodel.HInterID.ToString() != null && oBill.omodel.HInterID.ToString() != "undefined")
                {
                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                }

 WebAPI/DLL/DAL.dll

Binary files differ