From 46ca4c95375f112a28113049517d27dc2e94384f Mon Sep 17 00:00:00 2001 From: zrg <z18737863051@163.com> Date: 星期四, 18 七月 2024 17:18:56 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/Controllers/ProductInController.cs | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/WebAPI/Controllers/ProductInController.cs b/WebAPI/Controllers/ProductInController.cs index 81e5847..a9a1b45 100644 --- a/WebAPI/Controllers/ProductInController.cs +++ b/WebAPI/Controllers/ProductInController.cs @@ -264,8 +264,11 @@ //oBar = webserver.get_CheckTypeByBarCode(sCode, sInterID, sBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo); WebS.WebService1 oWebs = new WebS.WebService1(); WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS(); - 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); + + Kf_MateOutBillController obill = new Kf_MateOutBillController(); + //閲嶆柊鍚屾鐢熶骇棰嗘枡鍗� + objJsonResult = obill.GetKf_MateOutBill_Sync_Json(HBillNo, HBillType); + WebSoBar = oWebs.get_BillBarCode_MateOutCheck(HBillNo, HBillType, HMaker, HOwnerID, ref DBUtility.ClsPub.sErrInfo); if (WebSoBar == null) { -- Gitblit v1.9.1