Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

2025-03-29 d79db0da7de1c22e6803a45144ccdd9c931fbbc1

Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java

@@ -114,7 +114,7 @@


    @PreAuthorize("hasAuthority('manager:waitPakin:update')")
    @ApiOperation("组盘")
    @ApiOperation("组拖")
    @PostMapping("/waitPakin/merge")
    public R pikinOrder(@RequestBody WaitPakinParam waitPakin) {
        if (Objects.isNull(waitPakin)) {
@@ -129,5 +129,21 @@
        return R.ok(waitPakinService.mergeItems(waitPakin));
    }

    @PreAuthorize("hasAuthority('manager:waitPakin:update')")
    @ApiOperation("组拖解绑")
    @PostMapping("/waitPakin/unbind")
    public R pakinUnBind(@RequestBody WaitPakinParam param) {
        if (Objects.isNull(param)) {
            return R.error("参数不能为空！！");
        }
        if (StringUtils.isBlank(param.getBarcode())) {
            return R.error("托盘码不能为空！！");
        }
        if (Objects.isNull(param.getItems()) || param.getItems().isEmpty()) {
            return R.error("跟踪码不能为空！！");
        }
        return R.ok(waitPakinService);

    }

}

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java

@@ -103,15 +103,20 @@

    @Override
    public boolean fieldsSave(Map<String, Object> params) {
       //保存扩展字段
        ExtendFieldsUtils.saveFields(params);
        AsnOrderItem asnOrderItem = JSONObject.parseObject(JSONObject.toJSONString(params), AsnOrderItem.class);
        if (StringUtils.isBlank(asnOrderItem.getTrackCode())) {
            SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, params);
            String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, params);
            params.put("trackCode", ruleCode);
        }
        if (!this.saveOrUpdate(asnOrderItem)) {
            throw new CoolException("收货通知单明细保存失败！！");
        }
        //保存扩展字段
        try {
            ExtendFieldsUtils.saveFields(params);
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
        return true;
    }


 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java

@@ -44,10 +44,8 @@
    private ReportMsgService reportMsgService;
    @Resource
    private PurchaseMapper purchaseMapper;

    @Autowired
    private AsnOrderItemService asnOrderItemService;

    @Resource
    private SerialRuleMapper serialRuleMapper;

@@ -67,7 +65,6 @@
            return false;
        }
    }


    @Override
    public List<AsnOrder> getListByMatnr(Map<String, String> params) {
@@ -92,7 +89,9 @@
            throw new CoolException("主单信息不能为空");
        }
        AsnOrder orders = params.getOrders();

        if (Objects.isNull(orders)) {
            throw new CoolException("单据不能为空！！");
        }
        String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, orders);
        if (Objects.isNull(ruleCode)) {
            throw new CoolException("收货通知单编码生成失败！！");
@@ -111,7 +110,6 @@
            if (!asnOrderItemService.fieldsSave(item)) {
                throw new CoolException("明细保存失败！！");
            }

        });
        return R.ok("保存成功!!");
    }

 rsf-server/src/main/java/com/vincent/rsf/server/system/utils/ExtendFieldsUtils.java

@@ -28,7 +28,7 @@
     * @return
     * @time 2025/3/15 13:36
     */
    public static Boolean saveFields(Map<String, Object> params) {
    public static Boolean saveFields(Map<String, Object> params) throws Exception{
        FieldsService fieldsService = SpringUtils.getBean(FieldsService.class);
        List<Fields> fields = fieldsService.list(new LambdaQueryWrapper<Fields>()
                .eq(Fields::getStatus, 1)