From 51cfd909a5e61910dcbf3102e0b8e2774269c905 Mon Sep 17 00:00:00 2001 From: duhe <226547893@qq.com> Date: 星期五, 16 五月 2025 10:39:27 +0800 Subject: [PATCH] 宝工:生产计划排产导入时,日计划工单的生产车间id根据导入文件中的生产车间编码进行设置 --- WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormImportController.cs | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs" index e14a89d..9ff3d9c 100644 --- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs" +++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs" @@ -132,8 +132,16 @@ return objJsonResult; } - string sql1 = string.Format("select * from h_v_JIT_ICMOBillList_DR where 鍗曟嵁鍙�='{0}' and 鐢熶骇杞﹂棿浠g爜='{1}' and 浜у搧浠g爜='{2}' and 鏄庣粏琛屽彿={3} ", + string sql1 = ""; + if (oSystemParameter.omodel.WMS_CampanyName == "瀹濆伐") + { + sql1 = "select * from h_v_JIT_ICMOBillList_DR where 鍗曟嵁鍙�='" + tb2.Rows[i]["鐢熶骇璁㈠崟鍙�*"].ToString() + "' and 浜у搧浠g爜='" + tb2.Rows[i]["鐗╂枡缂栫爜*"].ToString() + "' and 鏄庣粏琛屽彿=" + tb2.Rows[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿*"].ToString(); + } + else + { + sql1 = string.Format("select * from h_v_JIT_ICMOBillList_DR where 鍗曟嵁鍙�='{0}' and 鐢熶骇杞﹂棿浠g爜='{1}' and 浜у搧浠g爜='{2}' and 鏄庣粏琛屽彿={3} ", tb2.Rows[i]["鐢熶骇璁㈠崟鍙�*"].ToString(), tb2.Rows[i]["鐢熶骇杞﹂棿缂栫爜*"].ToString(), tb2.Rows[i]["鐗╂枡缂栫爜*"].ToString(), tb2.Rows[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿*"].ToString()); + } ds = oCN.RunProcReturn(sql1, "h_v_JIT_ICMOBillList_DR"); if (ds.Tables[0].Rows.Count == 0) @@ -255,6 +263,24 @@ objJsonResult.data = tb2; return objJsonResult; } + if (oSystemParameter.omodel.WMS_CampanyName == "瀹濆伐") + { + string HOrgID = ds.Tables[0].Rows[0]["HItemID"].ToString(); + //鐢熶骇杞﹂棿 + ds = oCN.RunProcReturn($"select * from Gy_Department with(nolock) where HUSEORGID = {HOrgID} and HNumber='{tb2.Rows[i]["鐢熶骇杞﹂棿缂栫爜*"].ToString()}'", "Gy_Department"); + if (ds.Tables[0].Rows.Count > 0) + { + tb2.Rows[i]["HWorkShopID"] = ds.Tables[0].Rows[0]["HItemID"].ToString(); + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = $"绗瑊i + 1}琛�,鐢熶骇杞﹂棿鏌ユ棤鏁版嵁!"; + objJsonResult.data = tb2; + return objJsonResult; + } + } } objJsonResult.code = "1"; -- Gitblit v1.9.1