WebAPI/Controllers/SRM_MaterialBarCodeBillController.cs
@@ -94,7 +94,8 @@
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();//
            string msg3 = sArray[1].ToString();// 
            string UserName = "";
            string UserName = sArray[2].ToString();
            string OrganizationID = sArray[3].ToString();
            ListModels oListModels = new ListModels();
            try
            {
@@ -104,10 +105,11 @@
                msg2 = msg2.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_MaterialHanding(msg2);
                int get_BarCodecount = 0;
                foreach (Model.Cls_MaterialHandingModel oItem in lsmain)
                {
                    get_BarCodecount++;
                    UserName = oItem.HMaker;
                    //UserName = oItem.HMaker;
                }
                DAL.ClsWeb_BarCodeBill oBill = new DAL.ClsWeb_BarCodeBill();
                msg3 = msg3.Substring(1, msg3.Length - 2);
@@ -118,6 +120,14 @@
                ls = oListModels.getObjectByJson_BarCodeBill(msg3);//列表数据model
                if (ls.Count > 1)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "每次只允许选择一个物料生成条码,请退出重新选择一行物料,不允许选择多行物料!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                #region 数据准备
                long linterid = Pub_Class.ClsPub.CreateBillID_SRMProd("8888", ref DBUtility.ClsPub.sExeReturnInfo);
@@ -137,8 +147,12 @@
                string HKFDate= ls[0].HKFDQDate==null? DateTime.Now.ToString("yyyy/MM/dd"): ls[0].HKFDQDate;//生产日期
                string HKFDate_1 = string.Join("", HKFDate.Split('/').Select(x => x.PadLeft(2, '0')));
                double HMinQty= ls[0].HMinQty;//标准包装数
                string HStatusMan = ls[0].HStatusMan;//工号
                //string HBarCodeDate = ls[0].HBarCodeDate;//工号
                string HBarCodeDate = ls[0].HBarCodeDate == null ? DateTime.Now.ToString("yyyy/MM/dd") : ls[0].HBarCodeDate;//条码日期
                string HBarCodeDate_1 = string.Join("", HBarCodeDate.Split('-').Select(x => x.PadLeft(2, '0')));
                double HBQty= ls[0].HBQty;//最小包装数
                double HBQty = ls[0].HBQty;//最小包装数
                long HISKFPERIOD= ls[0].HISKFPERIOD;//是否启用保质期
                long HBatchManager= ls[0].HBatchManager;//是否启用批号
@@ -151,8 +165,7 @@
                string HMaterShortNumber = ls[0].HMaterShortNumber;
                string HMaterName = ls[0].HMaterName;
                //供应商
                long HSupID= ls[0].HSupID;
                string HSupName= ls[0].HSupName;
                long HSupID = lsmain[0].HSupID;
                string HMaker= ls[0].HMaker;
                DateTime HMakeDate= ls[0].HMakeDate;
                double HQty= ls[0].HQty; //本次生成条码数量
@@ -161,7 +174,8 @@
        DataSet Ds;
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                oCn.BeginTran();
                Ds = oCn.RunProcReturn("exec GetLSH '" + DateTime.Today + "'", "GetLSH");
                //Ds = oCn.RunProcReturn("exec GetLSH '" + DateTime.Today + "'", "GetLSH");
                Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HSupID+"_"+ HMaterID+"_" + HBarCodeDate + "'", "GetLSH");
                LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
                #endregion
@@ -209,7 +223,7 @@
                              : HMinQty;
                            ///供应商名称+@+物料代码+@+物料简称+@+数量+@条码数+@+日期+@+流水号  
                            LSH += 1;
                            TM = $"{oItemSub.HSupName}@{oItemSub.HMaterID}@{oItemSub.HMaterName}@{currentQty}@{HKFDate_1}@{LSH}";
                            TM = $"{oItemSub.HSupName}@{oItemSub.HMaterNumber}@{oItemSub.HSubjoin}@{currentQty}@{HBarCodeDate_1}@{LSH.ToString("D7")}";
                            //TM = $"{oItemSub.HSupName}@{oItemSub.HMaterID}@{oItemSub.HMaterName}@{oItemSub.biaoqianzhangshu}@{HKFDate_1}@{LSH}";
                            // 添加到生成的条码列表
                            generatedBarcodes.Add(TM);
@@ -239,15 +253,15 @@
                            //               + HKFDate + "','" + HKFDQDate + "'," + HISKFPERIOD + ")";
                            sql = "INSERT INTO Gy_BarCodeBill (HInterID, HBarCode, HBarCodeType, HMaterID, HUnitID, HQty, HKFDate, HKFPeriod, HKFDQDate, " +
       "HBatchNo, HBarcodeQtys, HBarcodeNo, HSupID, HGroupID, HMaker, HMakeDate, HPrintQty, HEndQty, HSupflag, " +
       "HSourceInterID, HSourceEntryID, HSourceBillNo, HSourceBillType, HMTONO, HProduceDate, HExpiryDate, HISKFPERIOD) " +
       "HSourceInterID, HSourceEntryID, HSourceBillNo, HSourceBillType, HMTONO, HProduceDate, HExpiryDate, HISKFPERIOD,HStatusMan,HBarCodeDate,HinitQty,HSTOCKORGID,HOWNERID) " +
      "VALUES (" +
       linterid.ToString() + ", '" + TM + "', '" + HBarCodeType + "', " + HMaterID + ", " + "0" + ", " + HQty + ", '" + HKFDate + "', " + HKFPeriod + ", '" + HKFDQDate + "', " +
       "'" + HBatchNo + "', " + get_BarCodecount + ", '" + virtualCount + "', " + HSupID + ", " + "0" + ", '" + ClsPub.CurUserName + "', '" + DateTime.Today.ToString("yyyy-MM-dd") + "', " + "1" + ", " + "0" + ", 1, " +
       "1, 1, '1', '" + HSourceBillType + "', '1', '" +
       HKFDate + "', '" + HKFDQDate + "', " + HISKFPERIOD + ")";
       linterid.ToString() + ", '" + TM + "', '" + HBarCodeType + "', " + HMaterID + ", " + "0" + ", " + currentQty + ", '" + null + "', " + HKFPeriod + ", '" + null + "', " +
       "'" + HBatchNo + "', " + get_BarCodecount + ", '" + virtualCount + "', " + HSupID + ", " + "0" + ", '" + UserName + "',getdate()" + "," + "0" + ", " + "0" + ", 1, " +
       "0, 0, '', '" + HSourceBillType + "', '', '" +
       null + "', '" + null + "', " + HISKFPERIOD + ",'" + HStatusMan + "','" + HBarCodeDate + "','" + currentQty + "'," + OrganizationID + "," + OrganizationID + "," + null + ")";
                            LogService.Write("生成条码: " + sql);
                            oCn.RunProc(sql);
                            oCn.RunProc("exec setLSH '" + DateTime.Today + "'");
                            oCn.RunProc(sql);
                            oCn.RunProc("exec h_p_WMS_SetMaxNo '" + HSupID + "_" + HMaterID + "_" + HBarCodeDate + "'");
                            virtualCount++;
                           }
@@ -258,7 +272,7 @@
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "生成条码成功!";
                objJsonResult.data = generatedBarcodes; // 返回生成的条码列表
                objJsonResult.data =string.Join("~", generatedBarcodes); // 返回生成的条码列表
                WebAPIController.Add_Log("条码下推", UserName, "生成条码");
                return objJsonResult;
            }
@@ -342,7 +356,7 @@
                }
                // 将逗号分隔的条码转换为SQL IN查询条件
                var barcodeList = barcodes.Split(',');
                var barcodeList = barcodes.Split('~');
                // 构建IN子句,为每个条码添加单引号
                var inValues = new List<string>();
@@ -352,7 +366,7 @@
                }
                string inClause = string.Join(",", inValues);
                string sql = $"SELECT * FROM h_v_Gy_UserMaterRelationPrint WHERE HBarCode IN ({inClause})";
                string sql = $"SELECT * FROM h_v_Gy_UserMaterRelationPrint WHERE HBarCode IN ({inClause})" + " order by 物料代码,cast(流水号 as int)";
                // 直接执行SQL查询
                DataSet ds = oCn.RunProcReturn(sql, "h_v_Gy_UserMaterRelationPrint");