#

18516761980

2021-09-28 0190125daca8a74bbdceadcbf58f45ee8b0c6173

 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);  //产品代码|生产单号
                    waitPakin.setBname(matCode.getMatNo());
//                    String Fnumber = (Cools.isEmpty(entry.getFSourceBillNo())) ? matCode.getMatNo() : matCode.getMatNo() + "|" + entry.getFSourceBillNo();
//                    waitPakin.setMatnr(Fnumber);  //产品代码|生产单号
//                    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);  //产品代码|生产单号
                waitPakin.setBname(matCode.getMatNo());
//                String Fnumber = (Cools.isEmpty(cpicmo.getFSourceBillNo())) ? matCode.getMatNo() : matCode.getMatNo() + "|" + cpicmo.getFSourceBillNo();
//                waitPakin.setMatnr(Fnumber);  //产品代码|生产单号
//                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);  //产品代码|生产单号
//                        String Fnumber = (Cools.isEmpty(outStockBillEntry.getFSourceBillNo())) ? outStockBillEntry.getFnumber() : outStockBillEntry.getFnumber()+"|"+outStockBillEntry.getFSourceBillNo();
//                        outStockBillEntry.setFnumber(Fnumber);  //产品代码|生产单号
                        if (!outStockService.insert(outStockBillEntry)) {
                            log.info("提取出库通知明细表OutStockBillEntry失败[FBrNo={},FInterID={},FEntryID={}]",outStockBillEntry.getFBrNo(),
                                    outStockBillEntry.getFInterID(),outStockBillEntry.getFEntryID());