From 02ba47f5a081fcfe6d7ea3a829769db5bf8b2c2b Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 24 七月 2023 13:32:33 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/POStockInBillController.cs | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/WebAPI/Controllers/POStockInBillController.cs b/WebAPI/Controllers/POStockInBillController.cs
index 2924faf..923ccbe 100644
--- a/WebAPI/Controllers/POStockInBillController.cs
+++ b/WebAPI/Controllers/POStockInBillController.cs
@@ -995,12 +995,12 @@
bool flag3 = dataSet5.Tables[0].Rows.Count > 0;
if (!flag3)
{
- POStockInBillController postockInBillController = new POStockInBillController();
- //鎵簮鍗曟柟娉�
- postockInBillController.set_SavePonderationBillMain_Temp_Source_Fast_Json("1103", text5, hinterid, HBillNo);
+ //POStockInBillController postockInBillController = new POStockInBillController();
+ ////鎵簮鍗曟柟娉�
+ //postockInBillController.set_SavePonderationBillMain_Temp_Source_Fast_Json("1103", text5, hinterid, HBillNo);
- //WEBSController webscontroller4 = new WEBSController();
- //object obj4 = webscontroller4.Get_SourceBarCode_PoStockIn_Json(hinterid, HBillNo, HBillType, text5, "1103", HMaker, HOrgID,1, oSystemParameterMain, ref DBUtility.ClsPub.sErrInfo);
+ WEBSController webscontroller4 = new WEBSController();
+ object obj4 = webscontroller4.get_SourceBarCode_POStockIn_Json(hinterid, HBillNo, HBillType, text5, "1103", HMaker, HOrgID);
@@ -1066,8 +1066,11 @@
bool flag4 = dataSet6.Tables[0].Rows.Count > 0;
if (!flag4)
{
- POStockInBillController postockInBillController2 = new POStockInBillController();
- postockInBillController2.set_SavePonderationBillMain_Temp_Source_Fast_Json("1103", text5, hinterid, HBillNo);
+ //POStockInBillController postockInBillController2 = new POStockInBillController();
+ //postockInBillController2.set_SavePonderationBillMain_Temp_Source_Fast_Json("1103", text5, hinterid, HBillNo);
+
+ WEBSController webscontroller4 = new WEBSController();
+ object obj4 = webscontroller4.get_SourceBarCode_POStockIn_Json(hinterid, HBillNo, HBillType, text5, "1103", HMaker, HOrgID);
}
}
}
--
Gitblit v1.9.1