#

Administrator

10 小时以前 47e872ed061be9411493e6f097f666c20663fd13

#

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

@@ -433,15 +433,9 @@
    @PostMapping("/comb/auth")
    public synchronized R comb(@RequestBody ArrayList<MesToCombParam> param){
        for (MesToCombParam mesToCombParam : param) {
            // 判断是否有相同条码的数据
            if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
                    eq("zpallet", mesToCombParam.getPalletId()).eq("io_status", "N")) > 0) {
                waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", mesToCombParam.getPalletId()));
            }

            if (mesToCombParam.getPalletId().length() != 8) {
                return R.error(mesToCombParam.getPalletId()+"-该托盘码不为8位");
            }
//            if (mesToCombParam.getPalletId().length() != 8) {
//                return R.error(mesToCombParam.getPalletId()+"-该托盘码不为8位");
//            }
//        if (param.getCombMats().size()>1){
//            throw new CoolException("不允许混料===>>" + param.getBarcode());
//        }
@@ -452,6 +446,11 @@
            if (countLoc > 0 || countWrk > 0) {
                return R.error(mesToCombParam.getPalletId()+"-工作档/库存条码数据已存在");
            }
            // 判断是否有相同条码的数据
            if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
                    eq("zpallet", mesToCombParam.getPalletId()).eq("io_status", "N")) > 0) {
                waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", mesToCombParam.getPalletId()));
            }
        }
        for (MesToCombParam mesToCombParam : param) {
            openService.mesToComb(mesToCombParam);

 src/main/java/com/zy/asrs/entity/param/MesToCombParam.java

@@ -28,7 +28,7 @@
    //操作类型，1 组托；2 组托解绑；
    private Integer operateType;
    //唯一码
    private String BizNo;
    private String bizNo;
    //是否散货，0 非散货；1 散货；为了管控出货速率，散货可以出慢点。
    private Integer package1;
}

 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java

@@ -1276,7 +1276,7 @@

            if (param.getFull() == 1) {
                //满托盘
                mat = matService.selectByMatnr(param.getMatnr());
                mat = matService.selectByMatnr("emptyPallet");
            } else if (param.getFull() == 0) {
                //空托盘
                mat = matService.selectByMatnr("emptyPallet");
@@ -1285,6 +1285,7 @@

        WaitPakin waitPakin = new WaitPakin();
        waitPakin.sync(mat);
//        waitPakin.setMatnr(param.getMatnr());
        waitPakin.setBatch(String.valueOf(param.getBatchId()));
        waitPakin.setZpallet(param.getPalletId());   // 托盘码


 src/main/resources/application.yml

@@ -93,9 +93,9 @@
    ErpReportOld: true
  #  地址
  address:
    URL: https://shyucheng.test.kdgalaxy.com
    URL: http://192.168.160.8:8088
    #入库上报
    Inaddress: /kapi/oauth2/getToken
    Inaddress: /api/Service/InPalletCompleted
    #商品档案地址
    Outaddress: /kapi/v2/eap7/basedata/bd_material/batchQuery