From f10dd2827a613e9edfd58e359564dd59b5bf88f2 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 22 十二月 2021 17:37:20 +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 af06fd8..13a7233 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";
@@ -465,6 +469,7 @@
//string sSourceBillType = lsmain[0].HBillType;
//BLL.ClsKf_ProductInBill bll = new BLL.ClsKf_ProductInBill();
//return bll.set_SaveProductInBill_New(lsmain[0], sSourceBillType, ref DBUtility.ClsPub.sErrInfo);
+
try
{
List<Model.ClsKf_ProductInBillMain> lsmain = new List<Model.ClsKf_ProductInBillMain>();
@@ -481,10 +486,13 @@
websLsmain.HBillNo = lsmain[0].HBillNo;
websLsmain.HDeptID = lsmain[0].HDeptID;
websLsmain.HEmpID = lsmain[0].HEmpID;
+ websLsmain.HKeeperID= lsmain[0].HKeeperID;
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