字段添加完成，测试完成

wang..123

2022-02-15 7182f72ba4781c620eebdf501ca46b3f69f5585d

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -44,7 +44,8 @@
    private IoCompleteService ioCompleteService;
    @Autowired
    private PltBarcodeService pltBarcodeService;

    @Autowired
    private  MatCodeService matCodeService;
    /**
     * ERP接口是否启用
     */
@@ -99,14 +100,17 @@
                    for (WrkDetl wrkDetl : wrkDetls) {
                        LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getLocNo()).eq("mat_no", wrkDetl.getMatNo()).eq("supplier", wrkDetl.getSupplier()));
                        if (null != locDetl) {
                            boolean res = locDetlService.updateAnfme(wrkDetl.getQty()+locDetl.getQty(), wrkMast.getLocNo(), wrkDetl.getMatNo());
                            boolean res = locDetlService.updateAnfme(wrkDetl.getQty()+locDetl.getQty(), wrkMast.getLocNo(), wrkDetl.getMatNo(),wrkDetl.getSupplier());


                            if (!res) {
                                exceptionHandle("全板入库 ===>> 更新库存明细失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                            }
                        } else {
                            WrkDetl wrk_no = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>()
                                    .eq("wrk_no", wrkMast.getWrkNo()));
                            
                                    .eq("wrk_no", wrkMast.getWrkNo()).eq("mat_no",wrkDetl.getMatNo()).eq("supplier",wrkDetl.getSupplier()));

                            MatCode matCode = matCodeService.selectOne(new EntityWrapper<MatCode>().eq("mat_no", wrkDetl.getMatNo()));
                            locDetl = new LocDetl();
                            
                            locDetl.setLocNo(wrkMast.getLocNo()); // 库位号
@@ -114,6 +118,12 @@
                            VersionUtils.setLocDetl(locDetl, wrkDetl); // 版本控制
                            locDetl.setModiTime(now);
                            locDetl.setAppeTime(now);
                            locDetl.setAllQty(wrk_no.getAllQty());
                            locDetl.setAllWeight(wrk_no.getAllWeight());
                            locDetl.setSource(wrk_no.getSource());
                            locDetl.setVendor(wrk_no.getVendor());
                            locDetl.setWeight(matCode.getWeight());
                            locDetl.setQtyBox(matCode.getStr6());
                            if (!Cools.isEmpty(wrk_no)){
                                locDetl.setMemo(wrk_no.getMemo());
                                locDetl.setSupplier(wrk_no.getSupplier());
@@ -190,7 +200,7 @@
                        // 修改库存明细数量，如果工作明细数量为0时，删除库存明细
                        LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()).eq("mat_no", wrkDetl.getMatNo()));
                        if (null != locDetl) {
                            if (!locDetlService.updateAnfme(locDetl.getQty() - wrkDetl.getQty(), locMast.getLocNo(), wrkDetl.getMatNo())) {
                            if (!locDetlService.updateAnfme(locDetl.getQty() - wrkDetl.getQty(), locMast.getLocNo(), wrkDetl.getMatNo(),wrkDetl.getSupplier())) {
                                exceptionHandle("拣料入库 ===>> 修改库存明细数量失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                            }

@@ -249,7 +259,7 @@
                    for (WrkDetl wrkDetl:wrkDetls54) {
                        LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()).eq("mat_no", wrkDetl.getMatNo()));
                        if (null != locDetl) {
                            if (!locDetlService.updateAnfme(wrkDetl.getQty()+locDetl.getQty(), locMast.getLocNo(), wrkDetl.getMatNo())) {
                            if (!locDetlService.updateAnfme(wrkDetl.getQty()+locDetl.getQty(), locMast.getLocNo(), wrkDetl.getMatNo(),wrkDetl.getSupplier())) {
                                exceptionHandle("并板入库 ===>> 修改库存明细数量失败；[workNo={0}],[matNo={1}]", wrkMast.getWrkNo(), wrkDetl.getMatNo());
                            }
                        } else {