From 2de7af1c4b432e39047852b62b6c3ec788fef8ba Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 03 八月 2022 17:29:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API into master
---
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index ac6d135..2073b09 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -189,14 +189,14 @@
objJsonResult.data = null;
return objJsonResult;
}
- if (HSourceID == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鐢熶骇璧勬簮娌℃湁閫夋嫨锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //if (HSourceID == 0)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鐢熶骇璧勬簮娌℃湁閫夋嫨锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
if (HCenterID == 0)
{
objJsonResult.code = "0";
@@ -213,14 +213,14 @@
objJsonResult.data = null;
return objJsonResult;
}
- if (HWorkTimes <= 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "宸ユ椂蹇呴』澶т簬0锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //if (HWorkTimes <= 0)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "宸ユ椂蹇呴』澶т簬0锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
//if (HEmpID2 == 0 )
//{
// objJsonResult.code = "0";
@@ -1149,5 +1149,7 @@
}
#endregion
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1