From 81bb23d6d09943a41bac424ae284e659dae13dfc Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 28 二月 2023 10:25:12 +0800
Subject: [PATCH] 瑞琪 同步删除 工序出站单
---
WebAPI/Controllers/Sc_ProcessMangementController.cs | 61 +++++++++++++++++++++++++++++-
1 files changed, 58 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 53cbe50..d68b954 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -20,7 +20,7 @@
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
private json objJsonResult = new json();
-
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
@@ -624,6 +624,19 @@
////鏍规嵁宸ュ簭姹囨姤鍗曚富ID鑾峰彇宸ュ簭姹囨姤鍏ュ簱鍗曠殑鏁版嵁
//DataSet ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList_LastProc where HInterID=" + InterID, "h_v_MES_StationOutBillList_LastProc");
//DataRow dr = ds.Tables[0].Rows[0];
+
+ //鍒ゆ柇鍏ュ簱鐨勫悎鏍兼暟閲忔槸鍚︿负0
+ var DTable = oCN.RunProcReturn("select * from Sc_StationOutBillMain where HBillNo='"+ BillNo + "' ", "Sc_StationOutBillMain").Tables[0];
+
+ if (double.Parse(DTable.Rows[0]["HQty"].ToString()) == 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍚堟牸鏁伴噺涓�0,涓嶉渶瑕佸叆搴擄紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//淇濆瓨
oCN.BeginTran();
//鐢熶骇姹囨姤鍗曚富琛�
@@ -712,7 +725,21 @@
FentityModel.Add("FBaseRealQty", item["鏁伴噺"].ToString());//
FentityModel.Add("FOwnerTypeId", "BD_OwnerOrg");//
FentityModel.Add("FOwnerId", new JObject() { ["FNumber"] = item["HPrdOrgNumber"].ToString() });//
- FentityModel.Add("FStockId", new JObject() { ["FNumber"] = item["HStockNumber"].ToString() }); // 浠撳簱
+ string sErr = "";
+ if (oSystemParameter.ShowBill(ref sErr))
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "鐟炰笌绁�")
+ {
+ if (oSystemParameter.omodel.MES_StationOutBill_InStockType == "宸ヨ壓璺嚎")
+ {
+ FentityModel.Add("FStockId", new JObject() { ["FNumber"] = item["HStockNumbers"].ToString() }); // 浠撳簱
+ }
+ else if (oSystemParameter.omodel.MES_StationOutBill_InStockType == "宸ュ簭")
+ {
+ FentityModel.Add("FStockId", new JObject() { ["FNumber"] = item["HStockNumber"].ToString() }); // 浠撳簱
+ }
+ }
+ }
FentityModel.Add("FLot", new JObject() { ["FNumber"] = item["HBatchNo"].ToString() }); //鎵瑰彿
FentityModel.Add("FISBACKFLUSH", "true");//
FentityModel.Add("FWorkShopId1", new JObject() { ["FNumber"] = item["HWorkShopNumber"].ToString() }); // 鐢熶骇杞﹂棿
@@ -871,6 +898,20 @@
////鏍规嵁宸ュ簭姹囨姤鍗曚富ID鑾峰彇宸ュ簭姹囨姤鍏ュ簱鍗曠殑鏁版嵁
//DataSet ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList_LastProc where HInterID=" + InterID, "h_v_MES_StationOutBillList_LastProc");
//DataRow dr = ds.Tables[0].Rows[0];
+
+ //鍒ゆ柇鏈鎶ュ簾鎬绘暟閲忔槸鍚︿负0
+ var DTable = oCN.RunProcReturn("select sum(HWasterQty) HWasterQty from Sc_StationOutBillMain where HProcExchBillNo='"+ BillNo + "' and HBFFlag=0 ", "Sc_StationOutBillMain").Tables[0];
+
+ if (double.Parse(DTable.Rows[0]["HWasterQty"].ToString()) == 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎶ュ簾鏁伴噺涓�0,涓嶉渶瑕佸叆搴擄紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
//淇濆瓨
oCN.BeginTran();
//鐢熶骇姹囨姤鍗曚富琛�
@@ -951,7 +992,21 @@
FentityModel.Add("FBaseRealQty", item["鏁伴噺"].ToString());//
FentityModel.Add("FOwnerTypeId", "BD_OwnerOrg");//
FentityModel.Add("FOwnerId", new JObject() { ["FNumber"] = item["HPrdOrgNumber"].ToString() });//
- FentityModel.Add("FStockId", new JObject() { ["FNumber"] = item["HStockNumber"].ToString() }); // 浠撳簱
+ string sErr = "";
+ if (oSystemParameter.ShowBill(ref sErr))
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "鐟炰笌绁�")
+ {
+ if (oSystemParameter.omodel.MES_StationOutBill_InStockType == "宸ヨ壓璺嚎")
+ {
+ FentityModel.Add("FStockId", new JObject() { ["FNumber"] = item["HStockNumbers"].ToString() }); // 浠撳簱
+ }
+ else if (oSystemParameter.omodel.MES_StationOutBill_InStockType == "宸ュ簭")
+ {
+ FentityModel.Add("FStockId", new JObject() { ["FNumber"] = item["HStockNumber"].ToString() }); // 浠撳簱
+ }
+ }
+ }
FentityModel.Add("FLot", new JObject() { ["FNumber"] = item["HBatchNo"].ToString() }); //鎵瑰彿
FentityModel.Add("FISBACKFLUSH", "true");//
FentityModel.Add("FWorkShopId1", new JObject() { ["FNumber"] = item["HWorkShopNumber"].ToString() }); // 鐢熶骇杞﹂棿
--
Gitblit v1.9.1