From 7636c2cfa97cd3c24070593c899d4e4e5d0caf89 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 10 四月 2026 16:49:10 +0800
Subject: [PATCH] 选择关键件进行解绑
---
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 44 ++++++++++++++++++++++++--------------------
1 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index dbe680e..56ad8cf 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -239,19 +239,20 @@
}
//鍒ゆ柇瀹㈡埛涓嶄负榫欏北姹介厤
- if (oSystemParameter.omodel.WMS_CampanyName != "榫欏北姹介厤" && oSystemParameter.omodel.WMS_CampanyName != "鐟炰笌绁�" && oSystemParameter.omodel.WMS_CampanyName != "娣诲悍绉戞妧" && oSystemParameter.omodel.WMS_CampanyName != "娴疯瘹") //绯荤粺鍙傛暟
- {
- if (HSourceID == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "[0000-2-006]鐢熶骇璧勬簮娌℃湁閫夋嫨锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
- //鍒ゆ柇瀹㈡埛涓洪緳灞辨苯閰�
- else if (oSystemParameter.omodel.WMS_CampanyName == "榫欏北姹介厤")
+ //if (oSystemParameter.omodel.WMS_CampanyName != "榫欏北姹介厤" && oSystemParameter.omodel.WMS_CampanyName != "鐟炰笌绁�" && oSystemParameter.omodel.WMS_CampanyName != "娣诲悍绉戞妧" && oSystemParameter.omodel.WMS_CampanyName != "娴疯瘹") //绯荤粺鍙傛暟
+ //{
+ // if (HSourceID == 0)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "[0000-2-006]鐢熶骇璧勬簮娌℃湁閫夋嫨锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ //}
+ ////鍒ゆ柇瀹㈡埛涓洪緳灞辨苯閰�
+ //else
+ if (oSystemParameter.omodel.WMS_CampanyName == "榫欏北姹介厤")
{
//鍒ゆ柇鏄惁涓哄宸ヤ綅
ds = oCN.RunProcReturn("select * from h_v_GetStationOutBill_Detail where 宸ュ簭ID = " + HProcID + " and 鐗╂枡ID = " + HMaterID + " and 娴佽浆鍗″彿 = '" + HProcExchBillNo + "'", "h_v_GetStationOutBill_Detail");
@@ -2655,14 +2656,17 @@
objJsonResult.data = null;
return objJsonResult;
}
- if (oBill.omodel.HChecker != "")
+ if (oSystemParameter.omodel.WMS_CampanyName != "鍗庤垷")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "[0000-1-013]鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ if (oBill.omodel.HChecker != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-013]鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
ds = oCn.RunProcReturn($"exec h_p_DelOutInBill {HInterID},'MES_StationOutBill_DeleteRelationCtl'", "h_p_DelOutInBill");
--
Gitblit v1.9.1