From f5bb218bb36f37445d06451f51795d131f85badb Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 20 十月 2021 08:39:13 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/Sc_MouldController.cs | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/WebAPI/Controllers/Sc_MouldController.cs b/WebAPI/Controllers/Sc_MouldController.cs
index 1178caf..2bc9e08 100644
--- a/WebAPI/Controllers/Sc_MouldController.cs
+++ b/WebAPI/Controllers/Sc_MouldController.cs
@@ -190,10 +190,10 @@
//msg2 = "[" + msg2.ToString() + "]";
msg1 = "[" + msg1.ToString() + "]";
DAL.ClsSc_MouldProdOutBill BillNew = new DAL.ClsSc_MouldProdOutBill();
- List<Model.ClsSc_MouldProdOutBillMain> mainList = Newtonsoft
+ List<Model.ClsSc_MouldStockBillMain> mainList = Newtonsoft
.Json
.JsonConvert
- .DeserializeObject<List<Model.ClsSc_MouldProdOutBillMain>>(msg1);
+ .DeserializeObject<List<Model.ClsSc_MouldStockBillMain>>(msg1);
List<Model.ClsSc_MouldStockBillSub> subList = Newtonsoft
.Json
.JsonConvert
@@ -213,6 +213,7 @@
}
BillNew.omodel.HYear = sYear;
BillNew.omodel.HPeriod = sPeriod;
+ BillNew.omodel.HInterID = mainList[0].HInterID;
BillNew.omodel.HBillNo = mainList[0].HBillNo.Trim();
BillNew.omodel.HMaker = mainList[0].HMaker;
BillNew.omodel.HDate = HDate;
@@ -229,7 +230,8 @@
BillNew.omodel.HRedBlueFlag = mainList[0].HRedBlueFlag;
BillNew.DetailColl = new List<Model.ClsSc_MouldStockBillSub>();
Model.ClsSc_MouldStockBillSub oSub = new Model.ClsSc_MouldStockBillSub();
-
+
+ oSub.HInterID = mainList[0].HInterID;
oSub.HEntryID = 1;
oSub.HRemark = DBUtility.ClsPub.isStrNull(subList[0].HRemark);
oSub.HSourceInterID = DBUtility.ClsPub.isLong(subList[0].HSourceInterID);
@@ -281,13 +283,13 @@
oSub.HDiameter = DBUtility.ClsPub.isStrNull(subList[0].HDiameter);
oSub.HBackFlag = DBUtility.ClsPub.isStrNull(subList[0].HBackFlag);
BillNew.DetailColl.Add(oSub);
- bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+ bResult = BillNew.AddBill_PDA(ref ClsPub.sExeReturnInfo);
//鎻愮ず
if (bResult == true)
{
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = ClsPub.sExeReturnInfo + "鍗曟嵁鍙�:" + mainList[0].HBillNo.Trim();
+ objJsonResult.Message = ClsPub.sExeReturnInfo + "鍗曟嵁鍙�:" + mainList[0].HInterID.ToString()+"鍗曟嵁涓籌D:"+ mainList[0].HInterID;
objJsonResult.data = null;
return objJsonResult;
}
@@ -432,7 +434,7 @@
oSub.HDesignLife = DBUtility.ClsPub.isLong(subList[0].HDesignLife);
oSub.HUseLife = DBUtility.ClsPub.isLong(subList[0].HUseLife);
BillNew.DetailColl.Add(oSub);
- bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+ bResult = BillNew.AddBill_PDA(ref ClsPub.sExeReturnInfo);
//鎻愮ず
if (bResult == true)
{
--
Gitblit v1.9.1