From 60609cab9b8b0f2b1e183b9b769b244d6a450355 Mon Sep 17 00:00:00 2001
From: Administrator <jinghz@oceic.com>
Date: 星期二, 25 四月 2023 10:37:44 +0800
Subject: [PATCH] 增加系统参数
---
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 54 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 38 insertions(+), 16 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index acdf976..c16c7e4 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -176,14 +176,14 @@
objJsonResult.data = null;
return objJsonResult;
}
- if (HEmpID == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鎿嶄綔鍛樻病鏈夐�夋嫨锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //if (HEmpID == 0)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鎿嶄綔鍛樻病鏈夐�夋嫨锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
//if (HQCCheckID == 0)
//{
// objJsonResult.code = "0";
@@ -192,14 +192,25 @@
// objJsonResult.data = null;
// return objJsonResult;
//}
- //if (HSourceID == 0)
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鐢熶骇璧勬簮娌℃湁閫夋嫨锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+
+ //鑾峰彇绯荤粺鍙傛暟
+ string Ret = "";
+ if (oSystemParameter.ShowBill(ref Ret))
+ {
+ //鍒ゆ柇瀹㈡埛
+ if (oSystemParameter.omodel.WMS_CampanyName != "榫欏北姹介厤") //绯荤粺鍙傛暟
+ {
+ if (HSourceID == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐢熶骇璧勬簮娌℃湁閫夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ }
//if (HCenterID == 0)
//{
// objJsonResult.code = "0";
@@ -1641,6 +1652,17 @@
return objJsonResult;
}
+ ds = oCn.RunProcReturn($"exec h_p_DelOutInBill {HInterID},'MES_StationOutBill_DeleteRelationCtl'", "h_p_DelOutInBill");
+
+ if (ds.Tables[0].Rows[0][0].ToString()== "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绯荤粺鍙傛暟鎺у埗,宸叉湁涓嬮亾宸ュ簭,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//鍐欏叆鍒犻櫎鏃ュ織
string WorkList = "鍒犻櫎鍑虹珯鍗曪細" + oBill.omodel.HBillNo;
if (!oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HProcExchInterID, oBill.omodel.HProcExchEntryID, ref DBUtility.ClsPub.sExeReturnInfo))
--
Gitblit v1.9.1