智云SRM-WEBAPI（目前客户通用API）
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
yusijie
2023-04-02 db85ff8c932328047a89a317f4d77fba236daeed 
 WebAPI/Controllers/BarCodeController.cs


@@ -13,6 +13,8 @@


using System.Web.Script.Serialization;


using WebAPI.Code;


using WebAPI.Models;


using WebAPI.Utility;




namespace WebAPI.Controllers


{




@@ -21,7 +23,8 @@


        private JsonResult objJsonResult = new JsonResult();


        private json objjson = new json();


        public new ClsCNSRM oCn = new ClsCNSRM();




        //获取系统参数


        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();


        public T ScriptDeserialize<T>(string strJson)


        {


            JavaScriptSerializer js = new JavaScriptSerializer();


@@ -494,6 +497,7 @@


        /// <returns></returns>


        public object GetBarcodeSaveBill_Box([FromBody] JObject msg)


        {


            string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);


            var _value = msg["msg"].ToString();


            string msg1 = _value.ToString();


            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);


@@ -525,33 +529,9 @@




                foreach (Model.ClsGy_MaterialList_WMS_Model oItemSub in ls)


                {


                    //if (oBill.CheckBarCode(oItemSub.HSourceInterID, oItemSub.HSourceEntryID) == false)


                    //{


                    //    objJsonResult.code = "0";


                    //    objJsonResult.count = 0;


                    //    objJsonResult.Message = "已存在条码，不允许重复生成！";


                    //    objJsonResult.data = null;


                    //    return objJsonResult;


                    //}


                    if (msg2 != string.Empty)


                    {


                        if (oItemSub.HBQty == 0 || oItemSub.HMinQty == 0)


                        {


                            objJsonResult.code = "0";


                            objJsonResult.count = 0;


                            objJsonResult.Message = "内箱包装数不能为0！";


                            objJsonResult.data = null;


                            return objJsonResult;


                        }


                        if (oItemSub.HWBQty == 0 || oItemSub.HWXQty == 0)


                        {


                            objJsonResult.code = "0";


                            objJsonResult.count = 0;


                            objJsonResult.Message = "外箱包装数不能为0！";


                            objJsonResult.data = null;


                            return objJsonResult;


                        }


                    }


                    //数量为0 跳过


                    if (oItemSub.HQty == 0 || oItemSub.HMinQty == 0 || oItemSub.HWXQty == 0)


                        continue;


                }


                long linterid = Pub_Class.ClsPub.CreateBillID_SRMProd("8888", ref DBUtility.ClsPub.sExeReturnInfo);


                int LSHlen = 6;             //流水号长度


@@ -733,6 +713,7 @@


                        }


                    }


                }




                string HBarCode = "";


                string HBarCodeType = "";


                Int64 HMaterID = 0;


@@ -752,6 +733,11 @@


                string HWei = "";


                string HMTONO = "";


                oCn.BeginTran();


                foreach (Model.ClsGy_MaterialList_WMS_Model oItemSub in ls)


                {


                    //更新条码档案 该源单其它条码默认已经打印过一次


                    oCn.RunProc($"update Gy_BarCodeBill set  HPrintQty += 1   where HPrintQty = 0 and  HSourceInterID={oItemSub.HSourceInterID} and HSourceEntryID = {oItemSub.HSourceEntryID}");


                }


                foreach (Model.ClsGy_BarCodeBill_WMS_Model oItemSub in ls2)


                {


                    //LogService.Write("循环第二次:" + oItemSub.HSupID);


@@ -774,6 +760,11 @@


                        HSourceBillNo = ClsPub.isStrNull(oItemSub.HSourceBillNo);


                        HSourceBillType = ClsPub.isStrNull(oItemSub.HSourceBillType);


                        HWei = ClsPub.isStrNull(oItemSub.HEndQty);


                        if (FCusName.Contains("夏宝"))


                        {


                            HBarCode = $"{oItemSub.HMaterID}";


                            HBarCodeType = "品种码_外箱";


                        }


                        string sql = "insert into Gy_BarCodeBill (HInterID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HKFDate,HKFPeriod,HKFDQDate" +


                                    ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HEndQty,HSupflag" +


                                    ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HMTONO " +


@@ -809,6 +800,11 @@


                        HSourceBillNo = ClsPub.isStrNull(oItemSub.HSourceBillNo);


                        HSourceBillType = ClsPub.isStrNull(oItemSub.HSourceBillType);


                        HWei = ClsPub.isStrNull(oItemSub.HEndQty);


                        if (FCusName.Contains("夏宝"))


                        {


                            HBarCode = $"{oItemSub.HMaterID}";


                            HBarCodeType = "品种码";


                        }


                        string sql = "insert into Gy_BarCodeBill (HInterID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HKFDate,HKFPeriod,HKFDQDate" +


                                    ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HEndQty,HSupflag" +


                                    ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HMTONO " +


@@ -873,6 +869,7 @@


        /// <returns></returns>


        public object GetBarcodeSaveBillOnlyInnerBox([FromBody] JObject msg)


        {


            string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);


            var _value = msg["msg"].ToString();


            string msg1 = _value.ToString();


            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);


@@ -900,30 +897,6 @@


                List<Model.ClsGy_MaterialList_WMS_Model> ls = new List<Model.ClsGy_MaterialList_WMS_Model>();


                List<Model.ClsGy_BarCodeBill_WMS_Model> ls2 = new List<Model.ClsGy_BarCodeBill_WMS_Model>();


                ls = oListModels.getObjectByJson_MaterialList(msg3);




                foreach (Model.ClsGy_MaterialList_WMS_Model oItemSub in ls)


                {


                    if (CheckBarCode(oItemSub.HSourceInterID, oItemSub.HSourceEntryID) == false)


                    {


                        objJsonResult.code = "0";


                        objJsonResult.count = 0;


                        objJsonResult.Message = "已存在条码，不允许重复生成！";


                        objJsonResult.data = null;


                        return objJsonResult;


                    }


                    if (msg2 != string.Empty)


                    {


                        if (oItemSub.HBQty == 0 || oItemSub.HMinQty == 0)


                        {


                            objJsonResult.code = "0";


                            objJsonResult.count = 0;


                            objJsonResult.Message = "内箱包装数不能为0！";


                            objJsonResult.data = null;


                            return objJsonResult;


                        }




                    }


                }


                long linterid = Pub_Class.ClsPub.CreateBillID_SRMProd("8888", ref DBUtility.ClsPub.sExeReturnInfo);


                int LSHlen = 6;             //流水号长度


                int SumLen = 10;            //总长度


@@ -940,6 +913,20 @@


                LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);


                foreach (Model.ClsGy_MaterialList_WMS_Model oItemSub in ls)


                {


                    //数量为0 跳过


                    if (oItemSub.HQty == 0)


                        continue;


                    //检验打印数量（HQTY）和未打印数量


                    string sql = $"select HQty -HBarcodeCount as HNotBarcodeCount ,* from Cg_POOrderBillSub where HEntryID = {oItemSub.HSourceEntryID}";


                    DataSet ds = oCn.RunProcReturn(sql, "tables");


                    if (ds.Tables[0].Rows.Count > 0 && Convert.ToInt32(ds.Tables[0].Rows[0][0]) < oItemSub.HQty)


                    {


                        objJsonResult.code = "0";


                        objJsonResult.count = 0;


                        objJsonResult.Message = $"物料编码{oItemSub.HMaterNumber}，本次生成条码数量不能超出未生成条码数量";


                        objJsonResult.data = null;


                        return objJsonResult;


                    }


                    //内箱


                    if (ClsPub.isLong(oItemSub.HMaterID) != 0)


                    {


@@ -999,6 +986,11 @@


                oCn.BeginTran();


                foreach (Model.ClsGy_BarCodeBill_WMS_Model oItemSub in ls2)


                {


                    //更新条码档案 该源单其它条码默认已经打印过一次


                    oCn.RunProc($"update Gy_BarCodeBill set  HPrintQty += 1   where HPrintQty = 0 and  HSourceInterID={oItemSub.HSourceInterID} and HSourceEntryID = {oItemSub.HSourceEntryID}");


                }


                foreach (Model.ClsGy_BarCodeBill_WMS_Model oItemSub in ls2)


                {


                    if (ClsPub.isLong(oItemSub.HMaterID) != 0)


                    {


                        HBarCode = oItemSub.HBarCode.ToString();


@@ -1031,8 +1023,27 @@


                    }


                }


                //暂时只回填关联数量


                string _sql = "exec H_p_SRM_BarCodeBill_Update_UpdateBillRelateData " + linterid.ToString();


                oCn.RunProc(_sql);


                foreach (Model.ClsGy_MaterialList_WMS_Model oItemSub in ls)


                {


                    if (oItemSub.HQty == 0)


                        continue;


                    //更新条码档案 该源单其它条码默认已经打印过一次


                    //更新 已打印数量


                    if (oItemSub.HSourceBillType == "1102")


                    {


                        string _HBarCodeType = "箱号条码";


                        if (FCusName.Contains("夏宝"))


                            _HBarCodeType = "品种码";


                        string sql = string.Empty;


                        sql = string.Format(@"


update t1 set  


t1.HBarcodeCount = 


isnull((select sum(HQty)from Gy_BarCodeBill where HSourceInterID = t1.HInterID and HSourceEntryID = t1.HEntryID and HBarCodeType ='{2}'),0)


from Cg_POOrderBillSub t1 


where t1.HInterID = {0} and t1.HEntryID ={1}", oItemSub.HSourceInterID, oItemSub.HSourceEntryID, _HBarCodeType);


                        oCn.RunProc(sql);


                    }


                }


                oCn.Commit();


            }


            catch (Exception e)


@@ -1447,15 +1458,12 @@


        /// <summary>


        /// 条码生成表体（采购订单）


        /// </summary>


        /// <param name="sMsg"></param>


        /// <param name="sMsg">采购订单HinterID</param>


        /// <returns></returns>


        public object GetHBarCodeShowBillSubBycg(string sMsg)


        {


            try


            {


                DataSet ds;


                string s = "";


                string ShowItem = " * ";//显示的字段


                if (DBUtility.ClsPub.isLong(sMsg) == 0)


                {


                    objjson.code = "0";


@@ -1464,9 +1472,18 @@


                    objjson.data = null;


                    return objjson;


                }


                //预处理 修改采购订单的退料数量


                var kdTbaleName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName");


                string sql = $@"update t1 set 


 t1.HMrbQty = t2.FMRBQTY


 from Cg_POOrderBillSub t1 


 join {kdTbaleName}..T_PUR_POORDERENTRY_R t2 


 on t1.HEntryID = t2.FENTRYID


 where t1.HInterID = {sMsg} ";//sMsg 采购订单hinterid


                oCn.RunProc(sql);


                DAL.ClsWeb_BarCodeBill oClsWeb_BarCodeBill = new DAL.ClsWeb_BarCodeBill();


                string sql = string.Format(@"select * from h_v_Cg_POOrderBillSub_ForWeb2 where HInterID = " + sMsg);


                ds = oCn.RunProcReturn(sql, "h_v_Cg_POOrderBillSub_ForWeb2");


                sql = string.Format(@"select * from h_v_Cg_POOrderBillSub_ForWeb2 where HInterID = " + sMsg);


                DataSet ds = oCn.RunProcReturn(sql, "h_v_Cg_POOrderBillSub_ForWeb2");


                //ds = oClsWeb_BarCodeBill.ShowBillSub(DBUtility.ClsPub.isLong(sMsg), ShowItem, ref DBUtility.ClsPub.sExeReturnInfo);


                if (ds == null || ds.Tables[0].Rows.Count == 0)


                {


@@ -1505,11 +1522,12 @@


        /// <returns></returns>


        public object GetBarcodeSaveBillBoxBycg([FromBody] JObject msg)


        {


            string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);


            var _value = msg["msg"].ToString();


            string msg1 = _value.ToString();


            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);


            string msg2 = sArray[0].ToString();


            string msg3 = sArray[1].ToString();


            string msg2 = sArray[0].ToString();//


            string msg3 = sArray[1].ToString();// 


            string UserName = "";


            ListModels oListModels = new ListModels();


            try


@@ -1527,9 +1545,10 @@


                msg3 = msg3.Replace("\\", "");


                msg3 = msg3.Replace("\n", "");  //\n


                List<Model.ClsGy_MaterialList_WMS_Model> ls = new List<Model.ClsGy_MaterialList_WMS_Model>();


                List<Model.ClsGy_BarCodeBill_WMS_Model> ls2 = new List<Model.ClsGy_BarCodeBill_WMS_Model>();


                List<Model.ClsGy_BarCodeBill_WMS_Model> ls3 = new List<Model.ClsGy_BarCodeBill_WMS_Model>();


                ls = oListModels.getObjectByJson_MaterialList(msg3);


                List<Model.ClsGy_BarCodeBill_WMS_Model> ls2 = new List<Model.ClsGy_BarCodeBill_WMS_Model>();//外箱model


                List<Model.ClsGy_BarCodeBill_WMS_Model> ls3 = new List<Model.ClsGy_BarCodeBill_WMS_Model>();//内箱model




                ls = oListModels.getObjectByJson_MaterialList(msg3);//列表数据model




                long linterid = Pub_Class.ClsPub.CreateBillID_SRMProd("8888", ref DBUtility.ClsPub.sExeReturnInfo);


                int LSHlen = 6;             //流水号长度


@@ -1549,17 +1568,18 @@


                string WeiShu = ""; //尾数


                DataSet Ds;


                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();


                oCn.BeginTran();


                Ds = oCn.RunProcReturn("exec GetLSH '" + DateTime.Today + "'", "GetLSH");


                LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);


                foreach (Model.ClsGy_MaterialList_WMS_Model oItemSub in ls)


                {


                    //数量为0 跳过


                    if (oItemSub.HQty == 0)


                    if (oItemSub.HQty == 0 || oItemSub.HMinQty == 0 || oItemSub.HWXQty == 0)


                        continue;


                    //检验打印数量（HQTY）和未打印数量


                    string sql = $"select HQty -HBarcodeCount as HNotBarcodeCount ,* from Cg_POOrderBillSub where HEntryID = {oItemSub.HSourceEntryID}";


                    DataSet ds = oCn.RunProcReturn(sql,"tables");


                    if (Convert.ToInt32(ds.Tables[0].Rows[0][0]) < oItemSub.HQty)


                    string sql = $"select HQty + isnull(HMrbQty,0) - HBarcodeCount as HNotBarcodeCount ,* from Cg_POOrderBillSub where HEntryID = {oItemSub.HSourceEntryID}";


                    DataSet ds = oCn.RunProcReturn(sql, "tables");


                    if (ds.Tables[0].Rows.Count > 0 && Convert.ToInt32(ds.Tables[0].Rows[0][0]) < oItemSub.HQty)


                    {


                        objJsonResult.code = "0";


                        objJsonResult.count = 0;


@@ -1567,8 +1587,28 @@


                        objJsonResult.data = null;


                        return objJsonResult;


                    }


                    //校验批号 和 生产日期


                    sql = $"select top 1 HKFDate from Gy_BarCodeBill where HSupID = '{oItemSub.HSupID}' and HBatchNo = '{oItemSub.HBatchNo.TrimStart().TrimEnd()}' and HMaterID ={oItemSub.HMaterID} and isnull(HKFDate, '') <> ''";


                    LogService.Write($"sql:{sql}");


                    DataTable dt = oCn.RunProcReturn(sql, "tables").Tables[0];


                    if (dt.Rows.Count > 0)


                    {


                        LogService.Write($"HKFDate:{dt.Rows[0][0]}");


                        sql = $"select DATEDIFF(D,{dt.Rows[0][0]},{oItemSub.HKFDate})";


                        ds = oCn.RunProcReturn(sql, "tables2");


                        LogService.Write($"DATEDIFF:{Convert.ToInt32(ds.Tables[0].Rows[0][0])}");


                        if (ds.Tables[0].Rows.Count > 0 && Convert.ToInt32(ds.Tables[0].Rows[0][0]) != 0)


                        {


                            objJsonResult.code = "0";


                            objJsonResult.count = 0;


                            objJsonResult.Message = $"物料编码{oItemSub.HMaterNumber}，批号{oItemSub.HBatchNo.TrimStart().TrimEnd()},生产日期为{dt.Rows[0][0]},请核对";


                            objJsonResult.data = null;


                            return objJsonResult;


                        }


                    }


                    if (ClsPub.isLong(oItemSub.HMaterID) != 0)


                    {




                        HNumber = oItemSub.HMaterID.ToString();


                        //HNumber = HNumber.Replace(".", "");


                        //HQty = Math.Ceiling(HBQty + ClsPub.isDoule(oItemSub.HWBQty));


@@ -1599,9 +1639,35 @@


                                HMinQty = HSumQty;


                            }




                            //  安瑞条码规则：物料编码（系统代入）@物料名称（系统代入）@规格型号（系统代入）@生产日期（手工输入）@数量（手工输入）@失效日期（手工输入）@批次号（手工代入）@供应商名称（系统代入）@采购订单号（系统代入）


                            TM = $"{oItemSub.HMaterNumber}@{oItemSub.HMaterName}@{oItemSub.HMaterModel}@{oItemSub.HKFDate}@{HMinQty}@{oItemSub.HKFDQDate}@{oItemSub.HBatchNo}@{oItemSub.HSupName}@{oItemSub.HSourceBillNo}";


                            //安瑞条码规则：物料编码（系统代入）@物料名称（系统代入）@规格型号（系统代入）@生产日期（手工输入）@数量（手工输入）@失效日期（手工输入）@批次号（手工代入）@供应商名称（系统代入）@采购订单号（系统代入）


                            TM = $"{oItemSub.HMaterNumber}@{oItemSub.HMaterName}@{oItemSub.HMaterModel}@{oItemSub.HKFDate}@{HMinQty}@{oItemSub.HKFDQDate}@{oItemSub.HBatchNo.TrimStart().TrimEnd()}@{oItemSub.HSupName}@{oItemSub.HSourceBillNo}";


                            Model.ClsGy_BarCodeBill_WMS_Model bar = new Model.ClsGy_BarCodeBill_WMS_Model();




                            var HBarCode_verify = TM.Split('@'); //校验条码信息


                            var HMaterNumber_verify = HBarCode_verify[0]; //校验物料编码


                            var HMaterName_verify = HBarCode_verify[1]; //校验物料名称


                            var HMaterModel_verify = HBarCode_verify[2]; //校验规格型号


                            var HSupName_verify = HBarCode_verify[7]; //校验供应商


                            var HSourceBillNo_verify = HBarCode_verify[8]; //校验采购订单号




                            sql = $"select * from Gy_Material where HNumber = '{HMaterNumber_verify}' and HName = '{HMaterName_verify}' and HModel = '{HMaterModel_verify}'";


                            DataSet verifyMatInfo = oCn.RunProcReturn(sql, "tables");




                            sql = $"select * from Cg_POOrderBillMain where HBillNo = '{HSourceBillNo_verify}'";


                            DataSet verifyBillInfo = oCn.RunProcReturn(sql, "tables");




                            sql = $"select * from Gy_Supplier where HName = '{HSupName_verify}'";


                            DataSet verifySupInfo = oCn.RunProcReturn(sql, "tables");




                            if (verifyMatInfo.Tables[0].Rows.Count <= 0 || verifyBillInfo.Tables[0].Rows.Count <= 0 || verifySupInfo.Tables[0].Rows.Count <= 0)


                            {


                                oCn.RollBack();


                                objJsonResult.code = "0";


                                objJsonResult.count = 0;


                                objJsonResult.Message = $"条码信息校验出错，请重新生成条码";


                                objJsonResult.data = null;


                                return objJsonResult;


                            }




                            bar.HBarCode = TM;


                            bar.HMaterID = oItemSub.HMaterID;


@@ -1629,6 +1695,7 @@


                        }


                    }


                }


                oCn.Commit();


                foreach (Model.ClsGy_BarCodeBill_WMS_Model oItemSub2 in ls2)


                {


                    if (ClsPub.isLong(oItemSub2.HMaterID) != 0)


@@ -1741,7 +1808,6 @@


                    int count = 1;


                    foreach (var oItemSub in SubModel)


                    {




                        if (ClsPub.isLong(oItemSub.HMaterID) != 0)


                        {


                            HBarCode = oItemSub.HBarCode.ToString();


@@ -1760,7 +1826,11 @@


                            HSourceBillNo = ClsPub.isStrNull(oItemSub.HSourceBillNo);


                            HSourceBillType = ClsPub.isStrNull(oItemSub.HSourceBillType);


                            HWei = ClsPub.isStrNull(oItemSub.HEndQty);




                            if (FCusName.Contains("夏宝"))


                            {


                                HBarCode = $"{oItemSub.HMaterID}";


                                HBarCodeType = "品种码_外箱";


                            }


                            string 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 " +


@@ -1768,7 +1838,6 @@


                                        + linterid.ToString() + ",'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID + "," + HUnitID + "," + HQty2 + ",'" + HKFDate + "'," + HKFPeriod + ",'" + HKFDQDate


                                        + "','" + HBatchNo + "','" + SubModel.Count + "','" + count + "'," + HSupID + "," + HGroupID + ",'" + ClsPub.CurUserName + "','" + DateTime.Today + "'," + HPrintQty + ",'" + HWei + "',1"


                                        + "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "')";


                            LogService.Write(sql);


                            oCn.RunProc(sql);


                            oCn.RunProc("exec setLSH '" + DateTime.Today + "'");


                            count++;


@@ -1801,6 +1870,11 @@


                            HSourceBillNo = ClsPub.isStrNull(oItemSub.HSourceBillNo);


                            HSourceBillType = ClsPub.isStrNull(oItemSub.HSourceBillType);


                            HWei = ClsPub.isStrNull(oItemSub.HEndQty);


                            if (FCusName.Contains("夏宝"))


                            {


                                HBarCode = $"{oItemSub.HMaterID}";


                                HBarCodeType = "品种码";


                            }


                            string 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 " +


@@ -1808,7 +1882,6 @@


                                      + linterid.ToString() + ",'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID + "," + HUnitID + "," + HQty2 + ",'" + HKFDate + "'," + HKFPeriod + ",'" + HKFDQDate


                                      + "','" + HBatchNo + "','" + SubModel.Count + "','" + _count + "'," + HSupID + "," + HGroupID + ",'" + ClsPub.CurUserName + "','" + DateTime.Today + "'," + HPrintQty + ",'" + HWei + "',1"


                                      + "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "')";


                            LogService.Write(sql);


                            oCn.RunProc(sql);


                            _count++;


                        }


@@ -1823,18 +1896,21 @@


                    //更新 已打印数量


                    if (oItemSub.HSourceBillType == "1102")


                    {


                        string _HBarCodeType = "箱号条码";


                        if (FCusName.Contains("夏宝"))


                            _HBarCodeType = "品种码";


                        string sql = string.Empty;


                        sql = string.Format(@"


update t1 set  


t1.HBarcodeCount = 


isnull((select sum(HQty)from Gy_BarCodeBill where HSourceInterID = t1.HInterID and HSourceEntryID = t1.HEntryID and HBarCodeType ='箱号条码'),0)


isnull((select sum(HQty)from Gy_BarCodeBill where HSourceInterID = t1.HInterID and HSourceEntryID = t1.HEntryID and HBarCodeType ='{2}'),0)


from Cg_POOrderBillSub t1 


where t1.HInterID = {0} and t1.HEntryID ={1}", oItemSub.HSourceInterID, oItemSub.HSourceEntryID);


where t1.HInterID = {0} and t1.HEntryID ={1}", oItemSub.HSourceInterID, oItemSub.HSourceEntryID, _HBarCodeType);


                        oCn.RunProc(sql);


                    }


                }


                oCn.Commit();


               




            }


            catch (Exception e)


            {


@@ -1961,12 +2037,20 @@


        }




        [Route("DeltetBarCodeBill")]


        [HttpGet]


        public object DeltetBarCodeBill(string HInterID, string HUserName)


        [HttpPost]


        public object DeltetBarCodeBill([FromBody] JObject oData)


        {


            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();


            try


            {


                var _value = oData["oData"].ToString();


                string msg1 = _value.ToString();


                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);


                string HInter = sArray[0].ToString();


                string HInterID = HInter.Replace("\"", "");


                string HUserName = sArray[1].ToString();




                string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);


                string sql = "select HItemID,HBarCode,HSourceInterID,HSourceEntryID,HQty,HBarCodeType,HSourceBillType from Gy_BarCodeBill where  HItemID in(" + HInterID + ") ";


                //LogService.Write("删除sql:" + sql);


                oCN.BeginTran();


@@ -1975,9 +2059,12 @@


                {


                    foreach (DataRow dr in dt.Rows)


                    {


                        string _HBarCodeType = "箱号条码";


                        if (FCusName.Contains("夏宝"))


                            _HBarCodeType = "品种码";


                        WebAPIController.Add_Log("条码档案删除", HUserName, "单号" + dr["HBarCode"].ToString());


                        //反写打印数量到采购订单子表


                        if (dr["HBarCodeType"].ToString() == "箱号内条码" && dr["HSourceBillType"].ToString() == "1102")


                        if (dr["HBarCodeType"].ToString() == _HBarCodeType && dr["HSourceBillType"].ToString() == "1102")


                            oCN.RunProc($"update Cg_POOrderBillSub set HBarcodeCount -= {dr["HQty"]} where  HInterID ={dr["HSourceInterID"]} and  HEntryID ={dr["HSourceEntryID"]}");


                        //反写打印数量到委外订单


                        if (dr["HBarCodeType"].ToString() == "箱号内条码" && dr["HSourceBillType"].ToString() == "1601")