From c0cee04d997030777bd85d198d82cc2567f4773f Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 02 二月 2024 18:18:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/POStockInBillController.cs | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/WebAPI/Controllers/POStockInBillController.cs b/WebAPI/Controllers/POStockInBillController.cs
index ec68edf..8c671f1 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);
}
}
}
@@ -3918,8 +3921,8 @@
List<Model.ClsKf_POStockInBillMain> lsmain = new List<Model.ClsKf_POStockInBillMain>();
ListModels oListModels = new ListModels();
lsmain = oListModels.getPOStockInBillMainByJson(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_POStockInBillMain websLsmain = new WebS.ClsKf_POStockInBillMain();
@@ -4436,6 +4439,7 @@
jobject16.Add("FSRCENTRYID", dataRow2["FENTRYID"].ToString());
jobject16.Add("FORDERBILLNO", dataRow2["FBILLNO"].ToString());
jobject16.Add("FPOORDERENTRYID", dataRow2["FENTRYID"].ToString());
+ jobject16.Add("FGiveAway", dataRow2["FGIVEAWAY"].ToString());//鏄惁璧犲搧
//jobject16.Add("FPrice", dataRow2["FPRICE"].ToString());
//jobject16.Add("FTaxPrice", dataRow2["FTAXPRICE"].ToString());
//jobject16.Add("FEntryTaxRate", dataRow2["FTAXRATE"].ToString());
@@ -5057,6 +5061,7 @@
,D.FSUPPLIERID,DS.FNUMBER AS FSUPPLIERNUMBER,D.FPURCHASEORGID,DOO.FNUMBER AS FPURCHASEORGNUMBER,CROO.FNUMBER AS FSETTLEORGNUMBER,
E.FPRICETIMEPOINT,E.FSETTLECURRID,EC.FNUMBER AS FSETTLECURRNUMBER,C.FMATERIALID,CM.FNUMBER AS FMATERIALNUMBER ,C.FUNITID
,CU.FNUMBER AS FUNITNUMBER,CR.FPRICE,CR.FTAXPRICE,CR.FTAXRATE,D.FPURCHASERID,isnull(T4.FNUMBER,'') AS FPURCHASERNUMBER
+,C.FGIVEAWAY AS FGIVEAWAY
FROM CG_POINSTOCKBILLSUB B
JOIN CG_POINSTOCKBILLMAIN M ON B.HINTERID = M.HINTERID
JOIN {0}..T_PUR_POORDERENTRY C ON B.HSOURCEINTERID = C.FID AND B.HSOURCEENTRYID = C.FENTRYID
@@ -5140,6 +5145,7 @@
FentityModel.Add("FPrice", item["FPRICE"].ToString());//鍗曚环
FentityModel.Add("FTaxPrice", item["FTAXPRICE"].ToString());//鍚◣鍗曚环
FentityModel.Add("FEntryTaxRate", item["FTAXRATE"].ToString());//绋庣巼
+ FentityModel.Add("FGiveAway", item["FGIVEAWAY"].ToString());//鏄惁璧犲搧
JArray Fentity2 = new JArray();
JObject FentityModel2 = new JObject();
--
Gitblit v1.9.1