From 0190125daca8a74bbdceadcbf58f45ee8b0c6173 Mon Sep 17 00:00:00 2001 From: 18516761980 <4761516tqsxp> Date: 星期二, 28 九月 2021 08:15:22 +0800 Subject: [PATCH] # --- src/main/java/com/zy/common/service/erp/task/ErpScheduler.java | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java b/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java index dd291d0..9a2bfa6 100644 --- a/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java +++ b/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java @@ -70,9 +70,9 @@ VersionUtils.setWaitPakIn(waitPakin, matCode); waitPakin.setMnemonic(entry.getFOrderBillNo()); // todo:luxiaotao 鐢熶骇鍗曞彿 waitPakin.setSupplier(dto.getInStockBill().getFBillNo()); // todo:luxiaotao 閫氱煡鍗曞彿 - String Fnumber = (Cools.isEmpty(entry.getFSourceBillNo())) ? matCode.getMatNo() : matCode.getMatNo() + "|" + entry.getFSourceBillNo(); - waitPakin.setMatnr(Fnumber); //浜у搧浠g爜|鐢熶骇鍗曞彿 - waitPakin.setBname(matCode.getMatNo()); +// String Fnumber = (Cools.isEmpty(entry.getFSourceBillNo())) ? matCode.getMatNo() : matCode.getMatNo() + "|" + entry.getFSourceBillNo(); +// waitPakin.setMatnr(Fnumber); //浜у搧浠g爜|鐢熶骇鍗曞彿 +// waitPakin.setBname(matCode.getMatNo()); Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>() .eq("supplier", waitPakin.getSupplier()) .eq("matnr", waitPakin.getMatnr()); @@ -128,9 +128,9 @@ VersionUtils.setWaitPakIn(waitPakin, matCode); waitPakin.setMnemonic(cpicmo.getFSourceBillNo()); // todo:luxiaotao 鐢熶骇鍗曞彿 waitPakin.setSupplier(cpicmo.getFBillNo()); // todo:luxiaotao 閫氱煡鍗曞彿 - String Fnumber = (Cools.isEmpty(cpicmo.getFSourceBillNo())) ? matCode.getMatNo() : matCode.getMatNo() + "|" + cpicmo.getFSourceBillNo(); - waitPakin.setMatnr(Fnumber); //浜у搧浠g爜|鐢熶骇鍗曞彿 - waitPakin.setBname(matCode.getMatNo()); +// String Fnumber = (Cools.isEmpty(cpicmo.getFSourceBillNo())) ? matCode.getMatNo() : matCode.getMatNo() + "|" + cpicmo.getFSourceBillNo(); +// waitPakin.setMatnr(Fnumber); //浜у搧浠g爜|鐢熶骇鍗曞彿 +// waitPakin.setBname(matCode.getMatNo()); Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>() .eq("supplier", waitPakin.getSupplier()) .eq("matnr", waitPakin.getMatnr()); @@ -212,8 +212,8 @@ eq("FEntryID", outStockBillEntry.getFEntryID()).eq("FBrNo",outStockBillEntry.getFBrNo()); OutStockBillEntry one = outStockService.selectOne(wrapper); if (null == one) { - String Fnumber = (Cools.isEmpty(outStockBillEntry.getFSourceBillNo())) ? outStockBillEntry.getFnumber() : outStockBillEntry.getFnumber()+"|"+outStockBillEntry.getFSourceBillNo(); - outStockBillEntry.setFnumber(Fnumber); //浜у搧浠g爜|鐢熶骇鍗曞彿 +// String Fnumber = (Cools.isEmpty(outStockBillEntry.getFSourceBillNo())) ? outStockBillEntry.getFnumber() : outStockBillEntry.getFnumber()+"|"+outStockBillEntry.getFSourceBillNo(); +// outStockBillEntry.setFnumber(Fnumber); //浜у搧浠g爜|鐢熶骇鍗曞彿 if (!outStockService.insert(outStockBillEntry)) { log.info("鎻愬彇鍑哄簱閫氱煡鏄庣粏琛∣utStockBillEntry澶辫触[FBrNo={},FInterID={},FEntryID={}]",outStockBillEntry.getFBrNo(), outStockBillEntry.getFInterID(),outStockBillEntry.getFEntryID()); -- Gitblit v1.9.1