From 230d692df99ab549d2441cde683ee591a26e98c0 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期三, 01 十二月 2021 14:21:00 +0800
Subject: [PATCH] 修改了奥邦快速生成条码模块选择设备出资料的方法
---
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index 65cd472..337127e 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -57,6 +57,7 @@
objJsonResult.data = null;
return objJsonResult;
}
+ BillNew.omodel.HPRDORGID= mainList[0].HPRDORGID;//缁勭粐
BillNew.omodel.HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
BillNew.omodel.HYear = sYear;
BillNew.omodel.HPeriod = sPeriod;
@@ -112,6 +113,14 @@
BillNew.omodel.HMaterIDD = ClsPub.isStrNull(mainList[0].HMaterIDD);
List<Model.ClsSc_ProcessExchangeBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessExchangeBillSub>>(msg3);
BillNew.DetailColl = new List<Model.ClsSc_ProcessExchangeBillSub>();
+ if (BillNew.omodel.HICMOInterID == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇烽�夋嫨浠诲姟鍗曪紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
for (int i = 0; i < subList.ToArray().Length; i++)
{
if (DBUtility.ClsPub.isInt(subList[i].HProcID) != 0)//HQty
@@ -182,7 +191,7 @@
oSub.HFstProc = "鍚�";
oSub.HKeyProc = DBUtility.ClsPub.isStrNull(subList[i].HKeyProc);
oSub.HSupID = DBUtility.ClsPub.isLong(subList[i].HSupID);
- oSub.HSupFlag = DBUtility.ClsPub.isBool(subList[i].HSupFlag);
+ oSub.HSupFlag = DBUtility.ClsPub.isBool(subList[i].isEntrust);
oSub.HBackProc = DBUtility.ClsPub.isBool(subList[i].HBackProc);
oSub.HEdit = DBUtility.ClsPub.isBool(subList[i].HEdit);
if (oSub.HCenterID == 0 && oSub.HSupFlag == false)
@@ -208,6 +217,8 @@
oSub.HTechnologyParameter = DBUtility.ClsPub.isStrNull(subList[i].HTechnologyParameter);
oSub.HPicNum = DBUtility.ClsPub.isStrNull(subList[i].HPicNum);
oSub.HProcCheckNote = DBUtility.ClsPub.isStrNull(subList[i].HProcCheckNote);
+ oSub.HMouldNo = "";
+ oSub.HProcWorkNum = "";
BillNew.DetailColl.Add(oSub);
}
}
--
Gitblit v1.9.1