From 251c330bf71a00bd221db3ac1c337dc0eed1e1da Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期二, 20 七月 2021 23:27:38 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-API
---
WebAPI/Controllers/品质管理/首检检验单/QC_FirstPieceCheckBillController.cs | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\346\243\200\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\346\243\200\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
index f26c014..8f68b08 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\346\243\200\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\346\243\200\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
@@ -11,6 +11,8 @@
namespace WebAPI.Controllers
{
//棣栨妫�楠屽崟Controller
+ //鏁版嵁搴撲富琛≦C_FirstPieceCheckBillMain
+ //鏁版嵁搴撳瓙琛≦C_FirstPieceCheckBillSub
public class QC_FirstPieceCheckBillController : ApiController
{
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
@@ -78,7 +80,10 @@
BillNew.omodel.HMaterID = ClsPub.isLong(mainList[0].HMaterID);
BillNew.omodel.HFirstCheckEmp = ClsPub.isLong(mainList[0].HFirstCheckEmp);
BillNew.omodel.HLastResult = ClsPub.isBool(mainList[0].HLastResult);
-
+ BillNew.omodel.HMainSourceInterID = ClsPub.isLong(mainList[0].HMainSourceInterID);
+ BillNew.omodel.HMainSourceEntryID = ClsPub.isLong(mainList[0].HMainSourceEntryID);
+ BillNew.omodel.HMainSourceBillNo = ClsPub.isStrNull(mainList[0].HMainSourceBillNo);
+ BillNew.omodel.HMainSourceBillType = ClsPub.isStrNull(mainList[0].HMainSourceBillType);
List<Model.ClsQC_FirstPieceCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_FirstPieceCheckBillSub>>(msg3);
BillNew.DetailColl = new List<Model.ClsQC_FirstPieceCheckBillSub>();
for (int i = 0; i < subList.ToArray().Length; i++)
--
Gitblit v1.9.1