From e1cc2eabf9699c8fb601ff42cf8ce34ad536bc76 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 27 四月 2023 14:56:06 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index c16c7e4..151d2a4 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -176,14 +176,6 @@
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";
@@ -197,8 +189,8 @@
string Ret = "";
if (oSystemParameter.ShowBill(ref Ret))
{
- //鍒ゆ柇瀹㈡埛
- if (oSystemParameter.omodel.WMS_CampanyName != "榫欏北姹介厤") //绯荤粺鍙傛暟
+ //鍒ゆ柇瀹㈡埛涓嶄负榫欏北姹介厤
+ if (oSystemParameter.omodel.WMS_CampanyName != "榫欏北姹介厤") //绯荤粺鍙傛暟
{
if (HSourceID == 0)
{
@@ -207,10 +199,27 @@
objJsonResult.Message = "鐢熶骇璧勬簮娌℃湁閫夋嫨锛�";
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");
+ if (ds != null && ds.Tables[0].Rows.Count <= 1)
+ {
+ if (HEmpID == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎿嶄綔鍛樻病鏈夐�夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
}
-
}
+
//if (HCenterID == 0)
//{
// objJsonResult.code = "0";
--
Gitblit v1.9.1