From 3db477ccda04b391872cbd570b7d1c1253e1f6e0 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 23 五月 2023 14:11:00 +0800
Subject: [PATCH] 生产订单备注字段改成白坯要求,底部备注下推流转卡的时候带到流转卡底部备注中去 生产订单 已经下推过  流转卡或 生产入库单 或生产领料单 后,就不能删除; 生产资源新增模块增加   负责人 HEmpID int 字段(gy_Employee) 非必录入,打印的时候打印出来 生产订单列表里增加关闭和反关闭按钮(在生产订单编辑模块里有这个功能,将一样的功能复制出来),列表显示关闭状态 工序流转卡维护列表增加当前工序过滤条件(下拉框形式,取值取工序列表) 网格选中行, 背景行 浅蓝色 显示;(优先改  生产订单列表,流转卡列表,出站单列表,进站单列表)(最好改JS底层方法)

---
 WebAPI/DLL/ClsSc_ProcessReport.cs |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/WebAPI/DLL/ClsSc_ProcessReport.cs b/WebAPI/DLL/ClsSc_ProcessReport.cs
index f70be5b..f1c9bb5 100644
--- a/WebAPI/DLL/ClsSc_ProcessReport.cs
+++ b/WebAPI/DLL/ClsSc_ProcessReport.cs
@@ -145,6 +145,8 @@
                 //鎻掑叆瀛愯〃
                 foreach (Models.ClsSc_ProcessReportSub oSub in DetailColl)
                 {
+                  
+
                     oCn.RunProc("Insert into Sc_ProcessReportSub " +
                   " (HInterID,HEntryID,HProcID,HProcNumber,HEmpID" +
                   ",HMaterID,HMaterNumber,HOutPrice,HOutMoney" +
@@ -158,7 +160,7 @@
                   "HSecUnitQty1,HSecUnitRate1,HSecUnitQty2,HSecUnitRate2,HUsingQty,"+
                   "HSelfBadCount,HPreBadCount,HPayMentQty,HOtherDeduct,HRelPay,"+
                   "HOtherItem1,HOtherItem2,HOtherItem3,HOtherItem4,HOtherItem5,"+
-                  "HPackType,HCheckEmpID,HWeight,HBatchNo" +
+                  "HPackType,HCheckEmpID,HWeight,HBatchNo,HRelationInterID" +
                   ") values("
                   + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HProcID.ToString() + ",'" + oSub.HProcNumber + "'," + oSub.HEmpID.ToString() +
                   "," + oSub.HMaterID.ToString() + ",'" + oSub.HMaterNumber + "'," + oSub.HOutPrice.ToString() + "," + oSub.HOutMoney.ToString() + 
@@ -173,17 +175,19 @@
                   "," + oSub.HSecUnitQty1.ToString() + "," + oSub.HSecUnitRate1.ToString() + "," + oSub.HSecUnitQty2.ToString() + "," + oSub.HSecUnitRate2.ToString() + "," + oSub.HUsingQty.ToString() +
                   "," + oSub.HSelfBadCount.ToString() + "," + oSub.HPreBadCount.ToString() + "," + oSub.HPayMentQty.ToString() + "," + oSub.HOtherDeduct.ToString() + "," + oSub.HRelPay.ToString() +
                   ",'" + oSub.HOtherItem1.ToString() + "','" + oSub.HOtherItem2.ToString() + "','" + oSub.HOtherItem3.ToString() + "','" + oSub.HOtherItem4.ToString() + "','" + oSub.HOtherItem5.ToString() +
-                  "','" + oSub.HPackType.ToString() + "'," + oSub.HCheckEmpID.ToString() + "," + oSub.HWeight.ToString() + ",'" + oSub.HBatchNo + "'" +
+                  "','" + oSub.HPackType.ToString() + "'," + oSub.HCheckEmpID.ToString() + "," + oSub.HWeight.ToString() + ",'" + oSub.HBatchNo + "','0'" +
                   ") ");
                 }
                 //鏇存柊鍏宠仈鏁伴噺
-                AddNewRelation(ref sReturn, omodel.HInterID);
+                //AddNewRelation(ref sReturn, omodel.HInterID);
+                //鏇存柊鍏宠仈鏁伴噺
+                 oCn.RunProc("exec h_p_Sc_UpDateICMOBillStepStatusRelation_Add " + omodel.HInterID);
                 //鍥炲~ 鐢熶骇鐘舵�佽〃  鏃ヨ鍒�  涓� 宸插畬宸� 鐘舵��
-                oCn.RunProc("exec h_p_Sc_UpDateICMOBillQualityStatus " + omodel.HICMOStatusInterID.ToString() + ",3");
+                //oCn.RunProc("exec h_p_Sc_UpDateICMOBillQualityStatus " + omodel.HICMOStatusInterID.ToString() + ",3");
                 //榛樿鍙樹负 鐢宠妫�楠岀姸鎬�
                 oCn.RunProc("exec h_p_Sc_UpDateProcessReportStatus " + omodel.HInterID.ToString() + ",15");
                 //
-                sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+                sReturn = omodel.HInterID.ToString();
                 oCn.Commit();
                 return true;
             }

--
Gitblit v1.9.1