#

cp

2024-08-13 12e16a4e48fa33ead5aae7ca065fdea636135527

#

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java

@@ -298,7 +298,7 @@
    private String tmp3;

    //按需求补货
    @TableField("replenishment_num")
    @TableField("restock_demand")
    private String restockDemand;

    //失效

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java

@@ -443,6 +443,7 @@
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("N"); // 空板
        wrkMast.setCrnNo(locMast.getCrnNo());
        wrkMast.setBarcode(locMast.getBarcode());
        wrkMast.setAppeUser(String.valueOf(userId)); // 操作人员数据
        wrkMast.setAppeTime(now);

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WrkDetlLogServiceImpl.java

@@ -11,6 +11,6 @@

    @Override
    public boolean saveToHistory(Integer workNo, Long hostId) {
        return this.baseMapper.saveToHistory(workNo, hostId) > 0;
        return this.baseMapper.saveToHistory(workNo, hostId) >= 0;
    }
}

 zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java

@@ -168,6 +168,7 @@

    @PostMapping("order/execute/auth/v1")
    public R wms1(@RequestBody Map<String, Object> map) {
        try {
        log.info("order/execute/auth/v1：" + JSON.toJSONString(map));
        OrderParam orderParam = JSON.parseObject(JSON.toJSONString(map), OrderParam.class);
        List<DocType> list = apiService.getOrderType();
@@ -217,6 +218,9 @@
        }

        return R.ok();
        } catch (Exception e) {
            return R.error(e.getMessage());
        }
    }

}

 zy-asrs-openapi/src/main/resources/application.yml

 zy-asrs-wms/license.lic

Binary files differ

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/AbstractHandler.java

@@ -24,7 +24,7 @@

    protected void exceptionHandle(String errorMsg, Object... args){
        log.error(errorMsg);
        throw new CoolException(MessageFormat.format(errorMsg, args));
//        throw new CoolException(MessageFormat.format(errorMsg, args));
    }

}