From 1948124877478db58b27841f9398aed97ef13053 Mon Sep 17 00:00:00 2001
From: chenhaozhe <gaozhechen26@gmail.com>
Date: 星期日, 26 十月 2025 17:19:15 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SCGL/日计划管理/Sc_JIT_ComplementGoodBillController.cs | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 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 a9104bf..45715d0 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"
@@ -719,11 +719,11 @@
string JIDLT = ""; //JIT鍒拌揣鍓嶇疆鏈燂紙澶╋級
string JIMLC = ""; //JIT鏈�灏忚捣閫侀噺
- HORGNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["缁勭粐缂栫爜"].ToString());
+ HORGNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["缁勭粐缂栫爜"].ToString()).Replace("'", "");
HORGName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["缁勭粐"].ToString());
- HSupNumer = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["渚涘簲鍟嗕唬鐮�"].ToString());
+ HSupNumer = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["渚涘簲鍟嗕唬鐮�"].ToString()).Replace("'", "");
HSupName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["渚涘簲鍟�"].ToString());
- HMaterNumer = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["鐗╂枡浠ｇ爜"].ToString());
+ HMaterNumer = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["鐗╂枡浠ｇ爜"].ToString()).Replace("'", "");
HMaterName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["鐗╂枡鍚嶇О"].ToString());
HMaterModel = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["瑙勬牸鍨嬪彿"].ToString());
HUntilName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["璁￠噺鍗曚綅"].ToString());
@@ -809,7 +809,7 @@
string msg = "";
oSystemParameter.ShowBill(ref msg);
- if (oSystemParameter.omodel.WMS_CampanyName == "瀹濆伐")
+ if (oSystemParameter.omodel.WMS_CampanyName == "瀹濆伐"|| oSystemParameter.omodel.WMS_CampanyName == "涓夊崌")
{
//JIT渚涜揣鎻愬墠鏈燂紙澶╋級
if (JISLT == "")
@@ -1028,6 +1028,7 @@
{
try
{
+ List<object> columnNameList = new List<object>();
//鏌ヨ鏉冮檺
if (!DBUtility.ClsPub.Security_Log_second("JIT_NeedMaterPlanConfigBill_Query", 1, false, user))
{
@@ -1040,10 +1041,19 @@
ds = oCN.RunProcReturn("select * from h_v_JIT_NeedMaterPlanConfigBillList where 1=1 " + sWhere + " order by hmainid desc ", "h_v_JIT_NeedMaterPlanConfigBillList");
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
return objJsonResult;
}
catch (Exception e)
@@ -1435,11 +1445,11 @@
string JIDLT = ""; //JIT鍒拌揣鍓嶇疆鏈燂紙澶╋級
string JIMLC = ""; //JIT鏈�灏忚捣閫侀噺
- HORGNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["缁勭粐缂栫爜"].ToString());
+ HORGNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["缁勭粐缂栫爜"].ToString()).Replace("'","");
HORGName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["缁勭粐"].ToString());
- HWorkShopNumer = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["杞﹂棿浠ｇ爜"].ToString());
+ HWorkShopNumer = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["杞﹂棿浠ｇ爜"].ToString()).Replace("'", "");
HWorkShopName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["杞﹂棿"].ToString());
- HMaterNumer = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["鐗╂枡浠ｇ爜"].ToString());
+ HMaterNumer = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["鐗╂枡浠ｇ爜"].ToString()).Replace("'", "");
HMaterName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["鐗╂枡鍚嶇О"].ToString());
HMaterModel = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["瑙勬牸鍨嬪彿"].ToString());
@@ -1508,7 +1518,7 @@
string msg = "";
oSystemParameter.ShowBill(ref msg);
- if (oSystemParameter.omodel.WMS_CampanyName == "瀹濆伐")
+ if (oSystemParameter.omodel.WMS_CampanyName == "瀹濆伐"|| oSystemParameter.omodel.WMS_CampanyName == "涓夊崌")
{
//JIT渚涜揣鎻愬墠鏈燂紙澶╋級
if (JISLT == "")
@@ -1701,7 +1711,7 @@
}
else
{
- oCN.RunProc(" update JIT_NeedMaterPlanConfigBillMain set HLeadTime=" + JISLT + ",HLeadTime_Sec=" + JIDLT + " where HMaterID=" + HMaterID + " and HWorkShopID = " + HWorkShopID);
+ oCN.RunProc(" update JIT_NeedMaterPlanConfigBillSub set HLeadTime=" + JISLT + ",HLeadTime_Sec=" + JIDLT + " where HMaterID=" + HMaterID + " and HWorkShopID = " + HWorkShopID);
}
i++;
--
Gitblit v1.9.1