From 730690716d28fc132c6df34c60cd1f584dd5be13 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 16 六月 2021 21:28:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-API
---
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs | 72 ++++++++++++++++++------------------
1 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
index cc78bce..c461134 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -162,6 +162,42 @@
//濮斿宸ュ簭鍙戝嚭鍙嶅簭鍒楀寲
msg1 = "[" + msg1.ToString() + "]";
List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg1);
+ long HProcExchInterID = list[0].lngBillKey;//娴佽浆鍗′富鍐呯爜
+ if (HProcExchInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "閿欒鐨勬祦杞崱鍐呯爜锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ long HProcExchEntryID = list[0].lngBillSubKey;//娴佽浆鍗″瓙鍐呯爜
+ if (HProcExchEntryID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娴佹按鍙锋病鏈夐�夋嫨锛佽杈撳叆娴佹按鍙峰悗鍥炶溅锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ long HProcNo = list[0].HProcNo;//娴佹按鍙�
+ if (HProcNo <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娴佹按鍙锋病鏈夐�夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string HProcExchBillNo = list[0].HProcExchBillNo;//娴佽浆鍗�
+ if (HProcExchBillNo == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娴佽浆鍗″彿娌℃湁閫夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
string eventType = list[0].eventType;
string BillType = "3790";
long HInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
@@ -176,9 +212,6 @@
long HProcPlanInterID = 0;
long HProcPlanEntryID = 0;
string HProcPlanBillNo = "";
- long HProcExchInterID = list[0].lngBillKey;//娴佽浆鍗′富鍐呯爜
- long HProcExchEntryID = list[0].lngBillSubKey;//娴佽浆鍗″瓙鍐呯爜
- string HProcExchBillNo = list[0].HProcExchBillNo;//娴佽浆鍗�
long HMaterID = list[0].HMaterID;//浜у搧ID
long HProcID = list[0].HProcID;//褰撳墠宸ュ簭
double HICMOQty = list[0].HICMOQty;//浠诲姟鍗曟暟閲�
@@ -197,41 +230,8 @@
double HPieceQty = list[0].HPieceQty;//鎺ユ敹浠舵暟
string HSourceName = list[0].HSourceName;//鐢熶骇璧勬簮鍚嶇О
long HCenterID = list[0].HCenterID;//宸ヤ綔涓績ID
- long HProcNo = list[0].HProcNo;//娴佹按鍙�
string HOrderProcNO = list[0].HOrderProcNO;//璁㈠崟璺熻釜鍙�
//鍗曟嵁瀹屾暣鎬у垽鏂�
- if (HProcExchInterID <= 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "閿欒鐨勬祦杞崱鍐呯爜锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- if (HProcExchEntryID <= 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "閿欒鐨勬祦杞崱瀛愬唴鐮侊紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
- if (HProcNo <= 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娴佹按鍙锋病鏈夐�夋嫨锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- if (HProcExchBillNo == "")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娴佽浆鍗″彿娌℃湁閫夋嫨锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
if (HMaterID <= 0)
{
objJsonResult.code = "0";
--
Gitblit v1.9.1