#

luxiaotao1123

2021-03-02 2cb1126682fb9dfaa1b20a1f03e95004b59b61a9

#

 src/main/java/com/zy/asrs/controller/WaitPakinController.java

@@ -45,6 +45,7 @@
        else {
            wrapper.orderBy("modi_time", false);
        }
        wrapper.isNotNull("zpallet");
        return R.ok(waitPakinService.selectPage(new Page<>(curr, limit), wrapper));
    }


 src/main/java/com/zy/asrs/utils/VersionUtils.java

@@ -80,6 +80,7 @@
        matCode.setMatNo(item.getMnumber()); // 物料编号
        matCode.setMatName(item.getMname()); // 物料描述
        matCode.setStr2(item.getMmodel()); // 物料类别
        matCode.setStr2(item.getMtypename());
    }

    // excel ----------------------------------------------------------------------

 src/main/java/com/zy/common/service/erp/entity/M_item.java

@@ -20,4 +20,6 @@
    // 类别
    private String Mmodel;

    private String Mtypename;

}

 src/main/java/com/zy/common/service/erp/task/ErpScheduler.java

@@ -109,7 +109,7 @@
    /**
     * 成品
     */
//    @Scheduled(cron = "0/3 * * * * ? ")
    @Scheduled(cron = "0/5 * * * * ? ")
//    @PostConstruct
    public void inCPICMOExecute(){
//        List<M_item> item = erpService.getItem();
@@ -156,7 +156,7 @@
        }
    }

//    @Scheduled(cron = "0/3 * * * * ? ")
    @Scheduled(cron = "0/5 * * * * ? ")
    public void syncMat(){
        List<M_item> items = erpService.getItem();
        for (M_item item : items) {
@@ -166,17 +166,28 @@
                VersionUtils.setMatCode(matCode, item);
                matCode.setAppeTime(new Date());
                matCode.setModiTime(new Date());
                matCodeService.insert(matCode);
                boolean insert = matCodeService.insert(matCode);
                if (insert) {
                    log.info("=====>> 新增物料成功 ： {}", JSON.toJSONString(item));
                } else {
                    log.error("=====>> 新增物料失败！！！ ： {}", JSON.toJSONString(item));
                }
            } else {
                VersionUtils.setMatCode(matCode, item);
                matCode.setModiTime(new Date());
                matCodeService.updateById(matCode);
                boolean b = matCodeService.updateById(matCode);
                if (b) {
                    log.info("=====>> 更新物料成功 ： {}", JSON.toJSONString(item));
                } else {
                    log.error("=====>> 更新物料失败！！！ ： {}", JSON.toJSONString(item));
                }
            }
            // 更新完之后删除
            erpService.deleteItem(item.getMnumber());
        }
    }


    /**
     * 原材料出库
     */