From d03656c5be5357c07deebc5858e6f8d4bd661706 Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期三, 26 一月 2022 16:25:38 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs b/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs
index 3c39e3b..6e8393a 100644
--- a/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs
@@ -258,23 +258,15 @@
}
oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- if (oBill.omodel.HBillStatus > 1)
+ if (oBill.omodel.HChecker != "")
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐨勭姸鎬�";
+ objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
objJsonResult.data = null;
return objJsonResult;
}
- //涓嶉渶瑕�
- //if (oBill.omodel.HChecker != "")
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鍗曟嵁褰撳墠宸插鏍�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+
if (oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
{
objJsonResult.code = "1";
--
Gitblit v1.9.1