From baca1376c502e0de5bf3962ebeb533372febd43f Mon Sep 17 00:00:00 2001 From: ch <37327@LLOOCCY> Date: 星期二, 27 十二月 2022 09:45:59 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/Controllers/MoveStockBillController.cs | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/WebAPI/Controllers/MoveStockBillController.cs b/WebAPI/Controllers/MoveStockBillController.cs index 676c811..f6586c8 100644 --- a/WebAPI/Controllers/MoveStockBillController.cs +++ b/WebAPI/Controllers/MoveStockBillController.cs @@ -542,8 +542,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, HStockOutOrgID, 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_BarCode_MoveStock(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, HSCWhID, HSCSPID, sQty, SourceFlag, sSourceBillNo, sHSourceBillType, HStockInOrgID,HStockOutOrgID,HScanStyle, ref DBUtility.ClsPub.sErrInfo); + WebSoBar = oWebs.get_BarCode_MoveStock(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, HSCWhID, HSCSPID, sQty, SourceFlag, sSourceBillNo, sHSourceBillType, HStockInOrgID,HStockOutOrgID,HScanStyle, ref DBUtility.ClsPub.sErrInfo); if (WebSoBar == null) { objJsonResult.code = "0"; @@ -618,7 +620,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 1; - objJsonResult.Message = "鐢熸垚璋冩嫧鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�"; + objJsonResult.Message = DBUtility.ClsPub.sErrInfo; objJsonResult.data = null; return objJsonResult; } -- Gitblit v1.9.1