From 349c22207a3fe4b070ec741383e8207615e2e72f Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期一, 23 八月 2021 19:31:23 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/ProductInController.cs | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/WebAPI/Controllers/ProductInController.cs b/WebAPI/Controllers/ProductInController.cs
index 92b7145..c648fca 100644
--- a/WebAPI/Controllers/ProductInController.cs
+++ b/WebAPI/Controllers/ProductInController.cs
@@ -219,6 +219,10 @@
{
ds = webserver.GetSc_ICMOBillList(sWhere + " ");
}
+ if (HSourceBillType == "3711")
+ {
+ ds = webserver.GetSc_ICMOReportBillList(sWhere + " ");
+ }
else
{
objJsonResult.code = "0";
@@ -483,6 +487,10 @@
websLsmain.HEmpID = lsmain[0].HEmpID;
websLsmain.HRemark = lsmain[0].HRemark;
websLsmain.HMaker = lsmain[0].HMaker;
+ websLsmain.HWHID = lsmain[0].HWHID;
+ websLsmain.HSupID = lsmain[0].HSupID;
+ websLsmain.HExplanation = lsmain[0].HExplanation;
+
if (webserver.set_SaveProductInBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
{
--
Gitblit v1.9.1