From a27fdcf6e7dd57fb408c0b5b4521d42ec90cb857 Mon Sep 17 00:00:00 2001 From: yxj <yxj@hz-kingdee.com> Date: 星期二, 02 一月 2024 16:09:55 +0800 Subject: [PATCH] 项目管理任务汇报保存功能,增加保存前、保存后控制 --- WebAPI/Controllers/SCGL/日计划管理/Sc_JIT_ComplementGoodBillController.cs | 83 +++++++++++++++++++++++++---------------- 1 files changed, 50 insertions(+), 33 deletions(-) diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_JIT_ComplementGoodBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_JIT_ComplementGoodBillController.cs" index 2a887c1..1763250 100644 --- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_JIT_ComplementGoodBillController.cs" +++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_JIT_ComplementGoodBillController.cs" @@ -21,6 +21,7 @@ private json objJsonResult = new json(); SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); DataSet ds; + Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); #region 鏃ヨ鍒掑钩鍙板熀纭�璧勬枡 杞﹂棿浠撳簱瀵圭収 @@ -419,6 +420,8 @@ public json AddPODBillSub(string msg3) { + string Ret = ""; + oSystemParameter.ShowBill(ref Ret); omodelPODsub = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Cg_PODemandPlanConfigBillSub>>(msg3); foreach (Models.Cg_PODemandPlanConfigBillSub oSub in omodelPODsub) @@ -447,21 +450,25 @@ objJsonResult.data = null; return objJsonResult; } - if (oSub.HLeadTime_Sec == 0 || oSub.HLeadTime_Sec == null) + + if (oSystemParameter.omodel.WMS_CampanyName != "甯呭▉") { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = " JIT鍒拌揣鍓嶇疆鏈熶笉鑳戒负绌�"; - objJsonResult.data = null; - return objJsonResult; - } - if (oSub.HDeliveryDaysCtrl == 0 || oSub.HDeliveryDaysCtrl == null) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = " JIT閫佽揣鎺у埗澶╂暟涓嶈兘涓虹┖"; - objJsonResult.data = null; - return objJsonResult; + if (oSub.HLeadTime_Sec == 0 || oSub.HLeadTime_Sec == null) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = " JIT鍒拌揣鍓嶇疆鏈熶笉鑳戒负绌�"; + objJsonResult.data = null; + return objJsonResult; + } + if (oSub.HDeliveryDaysCtrl == 0 || oSub.HDeliveryDaysCtrl == null) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = " JIT閫佽揣鎺у埗澶╂暟涓嶈兘涓虹┖"; + objJsonResult.data = null; + return objJsonResult; + } } } @@ -902,12 +909,10 @@ int i = 1; foreach (Dictionary<string, string> item in list) { - long HInterID = DBUtility.ClsPub.CreateBillID_Prod("4611", ref DBUtility.ClsPub.sExeReturnInfo);//鑾峰緱涓�涓柊鐨刬d - string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("4611", ref DBUtility.ClsPub.sExeReturnInfo, true);//鑾峰緱涓�涓柊鐨勫崟鎹彿 - string HOrgID = item["HOrgID"].ToString();//缁勭粐ID string HSupID = item["HSupID"].ToString();//渚涘簲鍟� - string HSupplierName = item["渚涘簲鍟�"].ToString(); string HMaterID = item["HMaterID"].ToString();//鐗╂枡ID + string HOrgID = item["HOrgID"].ToString();//缁勭粐ID + string HSupplierName = item["渚涘簲鍟�"].ToString(); string HMaterName = item["鐗╂枡鍚嶇О"].ToString(); string HMaterModel = item["瑙勬牸鍨嬪彿"].ToString(); string HUnitID = item["HUnitID"].ToString();//璁¢噺鍗曚綅 @@ -922,21 +927,33 @@ string JIMLC = item["JIT鏈�灏忚捣閫侀噺"].ToString(); string HRemark = item["澶囨敞"].ToString(); - - string sql = "insert into Cg_PODemandPlanConfigBillMain(HInterID,HBillNo,HYear,HPeriod,HBillType,HBillSubType,HDate,HBillStatus,HMaker,HMakeDate,HOrgId)" + - $"values({HInterID}, '{HBillNo}',{DateTime.Now.Year}, {DateTime.Now.Month}, '4611', '4611', GETDATE(), 1, '{user}', GETDATE(), {HOrgID})"; - string sql1 = "insert into Cg_PODemandPlanConfigBillSub(HInterID,HEntryID,HRemark,HSupplierID,HSupplierName,HMaterID," + - "HMaterName, HMaterModel, HJITMaterGroup, HJITSafeStock, HJITMaterDemand, HJITBatchQty, HDeliveryPeriod, " + - "HLeadTime, HLeadTime_Sec, HDeliveryMode, HDeliveryDaysCtrl,HUnitID,HJITMinDeliveryQty)values" + - $"({HInterID}, 1, '{HRemark}', {(HSupID == "" ? "0" : HSupID)}, '{HSupplierName}', {(HMaterID == "" ? "0" : HMaterID)}," + - $" '{HMaterName}', '{HMaterModel}', '{JITType}', {(JITPSL == "" ? "0" : JITPSL)}, {(JITMDSC == "" ? "0" : JITMDSC)},{(JIPEB == "" ? "0" : JIPEB)},{(JITPBCC == "" ? "0" : JITPBCC)}," + - $" {(JISLT == "" ? "0" : JISLT)}, {(JIDLT == "" ? "0" : JIDLT)}, '', {(JITDCD == "" ? "0" : JITDCD)} ,{HUnitID},{JIMLC})"; - LogService.Write("sql" + i + ":" + sql); - LogService.Write("sql1" + i + ":" + sql1); - //涓昏〃 - oCN.RunProc(sql); - //瀛愯〃 - oCN.RunProc(sql1); + ds = oCN.RunProcReturn("select * from Cg_PODemandPlanConfigBillSub where HMaterID=" + HMaterID + " and HSupplierID=" + HSupID, "Cg_PODemandPlanConfigBillSub"); + + if (ds.Tables[0].Rows.Count == 0) + { + + long HInterID = DBUtility.ClsPub.CreateBillID_Prod("4611", ref DBUtility.ClsPub.sExeReturnInfo);//鑾峰緱涓�涓柊鐨刬d + string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("4611", ref DBUtility.ClsPub.sExeReturnInfo, true);//鑾峰緱涓�涓柊鐨勫崟鎹彿 + + + string sql = "insert into Cg_PODemandPlanConfigBillMain(HInterID,HBillNo,HYear,HPeriod,HBillType,HBillSubType,HDate,HBillStatus,HMaker,HMakeDate,HOrgId)" + + $"values({HInterID}, '{HBillNo}',{DateTime.Now.Year}, {DateTime.Now.Month}, '4611', '4611', GETDATE(), 1, '{user}', GETDATE(), {HOrgID})"; + string sql1 = "insert into Cg_PODemandPlanConfigBillSub(HInterID,HEntryID,HRemark,HSupplierID,HSupplierName,HMaterID," + + "HMaterName, HMaterModel, HJITMaterGroup, HJITSafeStock, HJITMaterDemand, HJITBatchQty, HDeliveryPeriod, " + + "HLeadTime, HLeadTime_Sec, HDeliveryMode, HDeliveryDaysCtrl,HUnitID,HJITMinDeliveryQty)values" + + $"({HInterID}, 1, '{HRemark}', {(HSupID == "" ? "0" : HSupID)}, '{HSupplierName}', {(HMaterID == "" ? "0" : HMaterID)}," + + $" '{HMaterName}', '{HMaterModel}', '{JITType}', {(JITPSL == "" ? "0" : JITPSL)}, {(JITMDSC == "" ? "0" : JITMDSC)},{(JIPEB == "" ? "0" : JIPEB)},{(JITPBCC == "" ? "0" : JITPBCC)}," + + $" {(JISLT == "" ? "0" : JISLT)}, {(JIDLT == "" ? "0" : JIDLT)}, '', {(JITDCD == "" ? "0" : JITDCD)} ,{HUnitID},{JIMLC})"; + //涓昏〃 + oCN.RunProc(sql); + //瀛愯〃 + oCN.RunProc(sql1); + } + else + { + oCN.RunProc(" update Cg_PODemandPlanConfigBillSub set HLeadTime=" + JISLT + " where HMaterID=" + HMaterID + " and HSupplierID=" + HSupID); + } + i++; } -- Gitblit v1.9.1