From 0b2465fa3e82ac16f2057302a533ff7c8a3a4bf8 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 23 二月 2023 17:28:05 +0800
Subject: [PATCH] 结算方式,付款条件,库存状态,税率 --同步基础资料

---
 WebAPI/Controllers/ProductInController.cs |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/WebAPI/Controllers/ProductInController.cs b/WebAPI/Controllers/ProductInController.cs
index 2c655bb..d59654b 100644
--- a/WebAPI/Controllers/ProductInController.cs
+++ b/WebAPI/Controllers/ProductInController.cs
@@ -332,8 +332,10 @@
             WebS.WebService1 oWebs = new WebS.WebService1();
             WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
             string sExpressNumber = "";
+
+            var sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo, sMaker);
             //WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
-            WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sCode, sInterID, HBillType, sBillNo, sMaker,  WhID,  SPID,  sQty,  HOWNERID, ref DBUtility.ClsPub.sErrInfo);
+            WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sJXCode, sInterID, HBillType, sBillNo, sMaker,  WhID,  SPID,  sQty,  HOWNERID, ref DBUtility.ClsPub.sErrInfo);
             if (WebSoBar == null)
             {
                 objJsonResult.code = "0";
@@ -363,9 +365,10 @@
         {
             WebS.WebService1 oWebs = new WebS.WebService1();
             WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
+            var sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo, sMaker);
             string sExpressNumber = "";
             //WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
-            WebSoBar = oWebs.get_BarCode_MoveStockBillCheck(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, SCWhID, SCSPID, sQty, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
+            WebSoBar = oWebs.get_BarCode_MoveStockBillCheck(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, SCWhID, SCSPID, sQty, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
             if (WebSoBar == null)
             {
                 objJsonResult.code = "0";
@@ -1150,8 +1153,8 @@
                 List<Model.ClsKf_ProductInBillMain> lsmain = new List<Model.ClsKf_ProductInBillMain>();
                 ListModels oListModels = new ListModels();
                 lsmain = oListModels.getProductInBillMainByJson(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_ProductInBillMain websLsmain = new WebS.ClsKf_ProductInBillMain();

--
Gitblit v1.9.1