From ed80467e957a5ae62f2e7a4df1e794a24eb36af3 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 21 九月 2022 09:12:16 +0800
Subject: [PATCH] LAYUI列表列名改为动态加载模式( 器具保养规程单维护,器具寿命调整单维护,器具保养记录单维护,器具点检记录单维护,器具故障登记单维护,器具维修记录单维护,设备点检规程单维护,设备保养规程单维护,设备保养记录单维护,设备点检记录单维护,设备故障登记单维护,设备维修记录单维护,班组职员清单维护 )

---
 WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
index b8be0ad..625ae2d 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
@@ -265,6 +265,9 @@
                     return objJsonResult;
                 }
 
+                //鍚屾鏃ヨ鍒掑伐鍗�
+                oCN.RunProc("exec REALESE_SC_ICMOBILLSTATUS_TMP");
+
                 objJsonResult.code = "1";
                 objJsonResult.count = 1;
                 objJsonResult.Message = null;
@@ -323,7 +326,10 @@
         #region 娓呭崟閰嶆枡鏂瑰紡
         public class PRD_PPBOM
         {
-
+            /// <summary>
+            /// 鏃ヨ鍒掑伐鍗曞彿
+            /// </summary>
+            public string HMainICMOBillNo { get; set; }
             /// <summary>
             /// 鏃ヨ鍒掑伐鍗旻ID
             /// </summary>
@@ -537,6 +543,10 @@
             ///  涓荤敓浜ц鍗曞瓙鍐呯爜锛欶HMainICMOEntryID  
             /// </summary>
             public string FHMainICMOEntryID { get; set; }
+            /// <summary>
+            ///  鏃ヨ鍒掕鍗曞崟鍙凤細HMainICMOBillNo 
+            /// </summary>
+            public string HMainICMOBillNo { get; set; }
             /// <summary>
             ///  鏃ヨ鍒掕鍗曚富鍐呯爜锛欶HICMOInterID 
             /// </summary>
@@ -800,6 +810,7 @@
                                 FHStockOrgID = _item.FStockOrgId,
                                 FHPRDORGID = _item.FStockOrgId,
                                 FPRDBillNo = _item.HICMOBillNo,
+                                HMainICMOBillNo = _item.HMainICMOBillNo,
                                 FOwnerTypeId = "",
                                 FUnitDosage = _item.dwyl,//鍗曚綅鐢ㄩ噺
                                 FSumPlanCount = planNeed,//璁″垝鎬绘暟閲�
@@ -843,6 +854,7 @@
                                     FHStockOrgID = _item.FStockOrgId,
                                     FHPRDORGID = _item.FStockOrgId,
                                     FPRDBillNo = _item.HICMOBillNo,
+                                    HMainICMOBillNo = _item.HMainICMOBillNo,
                                     FOwnerTypeId = "",
                                     FUnitDosage = _item.dwyl,//鍗曚綅鐢ㄩ噺
                                     FSumPlanCount = planNeed,//璁″垝鎬绘暟閲�
@@ -894,6 +906,7 @@
                                             FHPRDORGID = _item.FStockOrgId,
                                             FErpClsID = _item.FErpClsID,
                                             FPRDBillNo = _item.HICMOBillNo,
+                                            HMainICMOBillNo = _item.HMainICMOBillNo,
                                             FOwnerTypeId = Inventory.FOwnerTypeId,
                                             FOwnerId = Inventory.FOwnerId,
                                             FUnitDosage = _item.dwyl,//鍗曚綅鐢ㄩ噺
@@ -937,6 +950,7 @@
                                 FHStockOrgID = _item.FStockOrgId,
                                 FHPRDORGID = _item.FStockOrgId,
                                 FPRDBillNo = _item.HICMOBillNo,
+                                HMainICMOBillNo = _item.HMainICMOBillNo,
                                 FOwnerTypeId = "",
                                 FUnitDosage = _item.dwyl,//鍗曚綅鐢ㄩ噺
                                 FSumPlanCount = planNeed,//璁″垝鎬绘暟閲�
@@ -973,6 +987,7 @@
                 insertDT.Columns.Add("FUNITDOSAGE", typeof(decimal));
                 insertDT.Columns.Add("FSUMPLANCOUNT", typeof(decimal));
                 insertDT.Columns.Add("FPRDBILLNO", typeof(string));
+                insertDT.Columns.Add("HMainICMOBillNo", typeof(string));
                 insertDT.Columns.Add("FOWNERID", typeof(long));
                 insertDT.Columns.Add("FOWNERTYPEID", typeof(string));
                 insertDT.Columns.Add("FPLANDATE", typeof(DateTime));
@@ -1004,6 +1019,7 @@
                     dr["FUNITDOSAGE"] = item.FUnitDosage;
                     dr["FSUMPLANCOUNT"] = item.FSumPlanCount;
                     dr["FPRDBILLNO"] = item.FPRDBillNo;
+                    dr["HMainICMOBillNo"] = item.HMainICMOBillNo;
                     dr["FOWNERID"] = item.FOwnerId == null ? "0" : item.FOwnerId;
                     dr["FOWNERTYPEID"] = item.FOwnerTypeId;
                     dr["FPLANDATE"] = item.FPlanDate.ToString("yyyy-MM-dd");
@@ -1030,12 +1046,12 @@
                             ", HICMOEntryID, HMaterID, HStockORGID, HStockQty, HLeftQty" +
                             ", HProdORGID, HUnitDosage, HSumPlanQty, HICMOBillNo, HOwnerID" +
                             ", HOwnerTypeID, HPlanDate, HComplete, HLackQty, HOccupyQty" +
-                            ", HCompleteQty1, HErpClsID, HWorkShopID, HWHID, HOccupyPickedQTY)values" +
+                            ", HCompleteQty1, HErpClsID, HWorkShopID, HWHID, HOccupyPickedQTY,HMainICMOBillNo)values" +
                              $"({item["FID"].ToString()}, 1, {item["FHMAINICMOINTERIDR"].ToString()}, {item["FHMAINICMOENTRYID"].ToString()}, {item["FHICMOINTERID"].ToString()}" +
                              $", {item["FHICMOENTRYID"].ToString()}, {item["FHMATERID"].ToString()}, {item["FHSTOCKORGID"].ToString()}, {item["FHSTOCKQTY"].ToString()}, {item["FHLEFTQTY"].ToString()}" +
                              $" , {item["FHPRDORGID"].ToString()}, {item["FUNITDOSAGE"].ToString()}, {item["FSUMPLANCOUNT"].ToString()}, '{item["FPRDBILLNO"].ToString()}', {item["FOWNERID"].ToString()}" +
                              $", '{item["FOWNERTYPEID"].ToString()}', '{item["FPLANDATE"].ToString()}','{item["FCOMPLETE"].ToString()}', {item["FLACKCOUNT"].ToString()}, {item["FOCCUPYCOUNT"].ToString()}" +
-                             $", {item["FCOMPLETECOUNT1"].ToString()}, {item["FERPCLSID"].ToString()}, {item["FWORKSHOPID"].ToString()}, {item["FSTOCKID"].ToString()}, {item["FOCCUPYPICKEDCOUNT"].ToString()})");
+                             $", {item["FCOMPLETECOUNT1"].ToString()}, {item["FERPCLSID"].ToString()}, {item["FWORKSHOPID"].ToString()}, {item["FSTOCKID"].ToString()}, {item["FOCCUPYPICKEDCOUNT"].ToString()}, '{item["HMainICMOBillNo"].ToString()}')");
                 }
                 LogService.Write("鎵归噺鎻掑叆鍒版暟鎹簱鐢ㄦ椂锛�" + sw.Elapsed);
                 //鎵ц瀹屾垚鍚� 鏇存柊鏃ヨ鍒掑伐鍗曠姸鎬�

--
Gitblit v1.9.1