From f002dca462390febf123891c62ae197c768219dc Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 02 二月 2024 10:29:44 +0800
Subject: [PATCH] 销售订单 删除方法,增加 调用 删除前控制 h_p_Xs_SeOrderBill_BeforeDelCtrl 和删除后控制 h_p_Xs_SeOrderBill_AfterDelCtrl的 存储过程。 销售出库单 删除方法,增加 调用 删除前控制 h_p_Kf_SellOutBill_BeforeDelCtrl 和删除后控制 h_p_Kf_SellOutBill_AfterDelCtrl的 存储过程。 收款单 删除方法,增加 调用 删除前控制 h_p_YS_ReceiveBill_BeforeDelCtrl 和删除后控制 h_p_YS_ReceiveBill_AfterDelCtrl的 存储过程。 应收退款单 删除方法,增加 调用 删除前控制 h_p_YS_ReceiveBackBill_BeforeDelCtrl 和删除后控制 h_p_YS_ReceiveBackBill_AfterDelCtrl的 存储过程。 销售订单变更单删除方法,增加 调用 删除前控制 h_p_Xs_SeOrderChangeBill_BeforeDelCtrl 和删除后控制 h_p_Xs_SeOrderChangeBill_AfterDelCtrl的 存储过程。 销售退货单删除方法,增加 调用 删除前控制 h_p_Kf_SellOutBackBill_BeforeDelCtrl 和删除后控制 h_p_Kf_SellOutBackBill_AfterDelCtrl的 存储过程。

---
 WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
index 8f391a6..bd708fd 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
@@ -892,17 +892,17 @@
 
         public static DataSet Sc_GetMESProductReportBillList(string sWhere)
         {
-            string sql = string.Format(@"select a.HInterID, a.HBillNo,a.HDate,a.HBillType,a.HBillStatus,a.HMaterID,m.HNumber HMaterCode,m.HName HMaterName,m.HModel HMaterSpec 
-                                   ,a.HSourceID,s.HNumber HSourceCode,s.HName HSourceName,a.HGroupID,g.HNumber HGroupCode,g.HName HGroupName
-                                   ,a.HWorkManID,e.HName HWorkManName,a.HMaker,a.HMakeDate, a.HReportType  
-                                   ,a.HQty,a.HICMOBillNo,a.HICMOInterID,a.HICMOEntryID 
-                                   ,a.HSourceInterID,a.HSourceEntryID,a.HSourceBillNo, a.HSourceBillType
-                                   from Sc_ICMOBillWorkQtyStatus_Tmp a 
-                                   left join Gy_Material m on a.HMaterID=m.hitemid
-                                   left join Gy_Source s on a.HSourceID=s.HItemID
-                                   left join Gy_Group g on a.HGroupID=g.HItemID
-                                   left join Gy_Employee e on a.HWorkManID=e.HItemID " + sWhere + " and HRelationInterID='0'");
-            return new SQLHelper.ClsCN().RunProcReturn(sql, "Sc_ICMOBillWorkQtyStatus_Tmp");
+            string sql = "";
+            if (sWhere != null && sWhere != "")
+            {
+                sql = "select * from h_v_Sc_ICMOBillWorkQtyTmpList_ReportingPlatform " + sWhere;
+            }
+            else
+            {
+                sql = "select * from h_v_Sc_ICMOBillWorkQtyTmpList_ReportingPlatform " ;
+            }
+            
+            return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_ICMOBillWorkQtyTmpList_ReportingPlatform");
         }
         #endregion
 
@@ -1077,7 +1077,7 @@
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "淇濆瓨澶辫触锛�";
+                    objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
                     objJsonResult.data = 1;
                     return objJsonResult;
                 }

--
Gitblit v1.9.1