#

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,55 +168,59 @@

    @PostMapping("order/execute/auth/v1")
    public R wms1(@RequestBody Map<String, Object> map) {
        log.info("order/execute/auth/v1：" + JSON.toJSONString(map));
        OrderParam orderParam = JSON.parseObject(JSON.toJSONString(map), OrderParam.class);
        List<DocType> list = apiService.getOrderType();
        DocType type = null;
        for (DocType docType : list) {
            if (docType.getDocName().equals(orderParam.getOrderType())) {
                type = docType;
                break;
        try {
            log.info("order/execute/auth/v1：" + JSON.toJSONString(map));
            OrderParam orderParam = JSON.parseObject(JSON.toJSONString(map), OrderParam.class);
            List<DocType> list = apiService.getOrderType();
            DocType type = null;
            for (DocType docType : list) {
                if (docType.getDocName().equals(orderParam.getOrderType())) {
                    type = docType;
                    break;
                }
            }
        }
        if (type == null) {
            return R.error("单据类型不存在");
        }
            if (type == null) {
                return R.error("单据类型不存在");
            }

        ArrayList<GenerateOrderMatParam> mats = new ArrayList<>();
        for (MatParam matParam : orderParam.getList()) {
            GenerateOrderMatParam mat = new GenerateOrderMatParam();
            mat.setMatnr(matParam.getMatnr());
            mat.setBatch(matParam.getBatch());
            mat.setAnfme(matParam.getCount());
            mat.setUnit(matParam.getUnit());
            mat.setWarehouse(matParam.getWarehouse());
            mat.setOrigin(matParam.getOrigin());
            mat.setOriginNo(matParam.getOriginNo());
            mats.add(mat);
        }
            ArrayList<GenerateOrderMatParam> mats = new ArrayList<>();
            for (MatParam matParam : orderParam.getList()) {
                GenerateOrderMatParam mat = new GenerateOrderMatParam();
                mat.setMatnr(matParam.getMatnr());
                mat.setBatch(matParam.getBatch());
                mat.setAnfme(matParam.getCount());
                mat.setUnit(matParam.getUnit());
                mat.setWarehouse(matParam.getWarehouse());
                mat.setOrigin(matParam.getOrigin());
                mat.setOriginNo(matParam.getOriginNo());
                mats.add(mat);
            }

        if (orderParam.getInOut() == 1) {
            //入库
            GenerateOrderPakInParam param = new GenerateOrderPakInParam();
            param.setHostId(1L);
            param.setOrderType(type.getDocId().intValue());
            param.setOrderNo(orderParam.getOrderNo());
            param.setMats(mats);
            apiService.generateOrderPakIn(param);
        } else if (orderParam.getInOut() == 2) {
            //出库
            GenerateOrderPakOutParam param = new GenerateOrderPakOutParam();
            param.setHostId(1L);
            param.setOrderType(type.getDocId().intValue());
            param.setOrderNo(orderParam.getOrderNo());
            param.setMats(mats);
            apiService.generateOrderPakOut(param);
        }else {
            //其他
            return R.error("出入库类型错误");
        }
            if (orderParam.getInOut() == 1) {
                //入库
                GenerateOrderPakInParam param = new GenerateOrderPakInParam();
                param.setHostId(1L);
                param.setOrderType(type.getDocId().intValue());
                param.setOrderNo(orderParam.getOrderNo());
                param.setMats(mats);
                apiService.generateOrderPakIn(param);
            } else if (orderParam.getInOut() == 2) {
                //出库
                GenerateOrderPakOutParam param = new GenerateOrderPakOutParam();
                param.setHostId(1L);
                param.setOrderType(type.getDocId().intValue());
                param.setOrderNo(orderParam.getOrderNo());
                param.setMats(mats);
                apiService.generateOrderPakOut(param);
            } else {
                //其他
                return R.error("出入库类型错误");
            }

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

}

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

@@ -28,7 +28,7 @@
  #  global-config:
  #    field-strategy: 0
  configuration:
    #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
    map-underscore-to-camel-case: true
    cache-enabled: true
  global-config:

 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));
    }

}