From 1413158ae9f0fc5ac7eb39deeab7d5cc09950ad1 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 01 二月 2024 10:57:51 +0800
Subject: [PATCH] 工序流转卡派工单删除方法,增加调用删除 前控制h_p_Sc_ProcExchSendWorkBill_BeforeDelCtrl 和删除 后控制h_p_Sc_ProcExchSendWorkBill_AfterDelCtrl 的存储过程。 工序委外派工单删除方法,增加 调用删除前控制h_p_WW_EntrustWorkOrderBill_BeforeDelCtrl 和删除后控制h_p_WW_EntrustWorkOrderBill_AfterDelCtrl 的存储过程。 工序进站接收单删除方法,增加调用删除前控制h_p_Sc_StationInBill_BeforeDelCtrl 和删除后控制h_p_Sc_StationInBill_AfterDelCtrl 的存储过程。 工序出站汇报单删除方法,增加调用删除前控制h_p_Sc_StationOutBill_BeforeDelCtrl 和删除后控制h_p_Sc_StationOutBill_AfterDelCtrl 的存储过程

---
 WebAPI/Controllers/Sc_MouldRepairInBillListController.cs |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index 6045550..9b8a85d 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -1063,14 +1063,18 @@
 
                 oCN.BeginTran();
                 //閿�鍞嚭搴撳垹闄ゅ洖濉攢鍞鍗曞叧鑱旀暟閲�
-                oCN.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToSellOut_Delete " + HInterID);
+                //oCN.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToSellOut_Delete " + HInterID);
 
-                oCN.RunProc("Delete From Kf_ICStockBillMain where HInterID = " + HInterID);
-                oCN.RunProc("Delete From Kf_ICStockBillSub where HInterID = " + HInterID);
+                //oCN.RunProc("Delete From Kf_ICStockBillMain where HInterID = " + HInterID);
+                //oCN.RunProc("Delete From Kf_ICStockBillSub where HInterID = " + HInterID);
+
+                string sql = "exec h_p_WMS_ICStockBillAndWMS_Delete " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','1205'";
+                oCn.RunProc(sql);
+
                 oCN.Commit();
                 objJsonResult.code = "1";
                 objJsonResult.count = 1;
-                objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+                objJsonResult.Message = "鎮ㄥ凡鍒犻櫎鍗曟嵁鍙蜂负" + BillOld.omodel.HBillNo + "鐨勯攢鍞嚭搴撳崟锛�";
                 objJsonResult.data = null;
                 return objJsonResult;
             }
@@ -1091,11 +1095,11 @@
         {
             if (sWhere == null || sWhere.Equals(""))
             {
-                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_SellOutBillList order by 鍗曟嵁鍙� desc", "h_v_IF_SellOutBillList");
+                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_SellOutBillList order by 鍒跺崟鏃ユ湡 desc,鍗曟嵁鍙� desc", "h_v_IF_SellOutBillList");
             }
             else
             {
-                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_SellOutBillList where 1=1 " + sWhere + " order by 鍗曟嵁鍙� desc", "h_v_IF_SellOutBillList");
+                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_SellOutBillList where 1=1 " + sWhere + " order by 鍒跺崟鏃ユ湡 desc,鍗曟嵁鍙� desc", "h_v_IF_SellOutBillList");
             }
         }
         #endregion

--
Gitblit v1.9.1