From 195b4a9f4ce855f550070ba90b9f3c57471e1d5b Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 04 九月 2024 18:10:18 +0800
Subject: [PATCH] 物料添加单个流转卡数量，批量生成流转卡优化，到货确认模块添加添康科技客户
---
WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs b/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs
index d302bef..0ae4bd1 100644
--- a/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs
+++ b/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs
@@ -15,6 +15,7 @@
public class SB_EquipICMOTechParamBillController : ApiController
{
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
public const string ModName = "3919"; //鍗曟嵁绫诲瀷
public const string ModCaption = "璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛�"; //鍗曟嵁鍚嶇О
public const string ModRightName = "SB_EquipICMOTechParamBill";
@@ -739,8 +740,26 @@
oBill.DetailColl.Add(oItemSub);
}
- //淇濆瓨
- bool bResult;
+ //鑾峰彇绯荤粺鍙傛暟
+ string Ret = "";
+ if (oSystemParameter.ShowBill(ref Ret))
+ {
+ if (oSystemParameter.omodel.SB_EquipICMOTechParamBill_MustBeginWorkCtl == "Y")
+ {
+ ds = oCn.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp where HSourceID = '" + oBill.omodel.HSourceID + "' and HSourceBillNo = '" + oBill.omodel.HProcExchBillNo + "' and HSourceInterID = '" + oBill.omodel.HProcExchInterID + "'and HSourceEntryID = '" + oBill.omodel.HProcExchEntryID + "' and hicmostatus =1", "Sc_ICMOBillStatus_Tmp");
+ if (ds.Tables[0].Rows[0]["HICMOStatus"].ToString() != "1")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠宸ュ崟涓嶆槸寮�宸ョ姸鎬佷笉鑳借繘琛岃澶囧伐鑹哄弬鏁扮偣妫�锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+
+ //淇濆瓨
+ bool bResult;
if (OperationType == "1") //鏂板淇濆瓨
{
bResult = oBill.AddBill (ref DBUtility.ClsPub.sExeReturnInfo);
--
Gitblit v1.9.1