From 152a02e90a7da2d431d2ea75499c1d07ef495e1b Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 23 三月 2023 09:27:33 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/OtherInStockController.cs | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/OtherInStockController.cs b/WebAPI/Controllers/OtherInStockController.cs
index 765f92e..9b7169d 100644
--- a/WebAPI/Controllers/OtherInStockController.cs
+++ b/WebAPI/Controllers/OtherInStockController.cs
@@ -167,6 +167,7 @@
{
try
{
+
string sErrMsg = "";
bool sBool = false;
oView = webserver.get_InfoByBarCode_Source(sBarCode, sInterID, ref sBool, ref sErrMsg);
@@ -233,6 +234,8 @@
string msg1 = _value.ToString();
try
{
+
+
List<Model.ClsKf_ICStockBillMain> lsmain = new List<Model.ClsKf_ICStockBillMain>();
ListModels oListModels = new ListModels();
lsmain = oListModels.getICStockBillMainByJson(msg1);
@@ -336,8 +339,8 @@
List<Model.ClsKf_OtherInBillMain> lsmain = new List<Model.ClsKf_OtherInBillMain>();
ListModels oListModels = new ListModels();
lsmain = oListModels.getOtherInBillMainByJson(msg1);
- lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
- lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
+ //lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ //lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
string sSourceBillType = lsmain[0].HBillType;
WebAPI.WebS.ClsKf_OtherInBillMain websLsmain = new WebS.ClsKf_OtherInBillMain();
@@ -350,7 +353,9 @@
websLsmain.HMaker = lsmain[0].HMaker;
websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
websLsmain.HOWNERID = lsmain[0].HSTOCKORGID;
+ websLsmain.HKeeperID = lsmain[0].HKeeperID;
websLsmain.HBillType = "1203";//鍥哄畾鍊�
+ websLsmain.HBillSubType = lsmain[0].HBillSubType;
WebS.WebService1 oWebs = new WebS.WebService1();
WebS.ClsXt_SystemParameterMain oSystemParameterMain = new WebS.ClsXt_SystemParameterMain();
--
Gitblit v1.9.1