#修改 1. 组拖问题修复

skyouc

2025-04-14 ed1f6cfe669199976cf9f4423ee4e7b440549016

#修改
1. 组拖问题修复

 rsf-admin/src/page/orders/asnOrder/AsnOrderEdit.jsx

@@ -105,7 +105,7 @@
                                    />
                                </Stack>
                        </Grid>
                    </Grid>
                    </Grid> 
                </SimpleForm>
            </Edit >
            <AsnOrderItemList />

 rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx

@@ -65,10 +65,10 @@
  '& .column-name': {
  },
  '& .opt': {
    width: 320
    width: 180
  },
  '& .status': {
    width: 100
    width: 90
  },
}));

@@ -145,7 +145,7 @@
          bulkActionButtons={<> <InspectionsButton /><BulkDeleteButton mutationMode={OPERATE_MODE} /></>}
          rowClick={() => 'edit'}
          expandSingle={true}
          omit={['id', 'createTime', 'createBy', 'memo', 'poId']}
          omit={['id', 'createTime', 'createBy', 'memo', 'poId', 'rleStatus$']}
        >
          <NumberField source="id" />
          <TextField source="code" label="table.field.asnOrder.code" />

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

@@ -118,7 +118,7 @@
        AsnOrderItem asnOrderItem = JSONObject.parseObject(JSONObject.toJSONString(params), AsnOrderItem.class);
        if (StringUtils.isBlank(asnOrderItem.getTrackCode())) {
            String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, asnOrderItem);
            asnOrderItem.setTrackCode(ruleCode);
            asnOrderItem.setTrackCode(ruleCode).setBarcode(ruleCode);;
        }
        if (Objects.isNull(asnOrderItem.getAnfme()) || Double.compare(asnOrderItem.getAnfme(), 0.0) <= 0) {
            throw new CoolException("计划收货数不能为空！！");

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

@@ -49,7 +49,7 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public WaitPakin mergeItems(WaitPakinParam waitPakin, Long userId) {
        if (waitPakin.getItems().isEmpty()) {
        if (Objects.isNull(waitPakin.getItems()) || waitPakin.getItems().isEmpty()) {
            throw new CoolException("参数错误：物料跟踪码为空！");
        }
        if (StringUtils.isBlank(waitPakin.getBarcode())) {