收货单优化

skyouc

2025-05-05 e211113fb94de4b54577fbcf6986bd5297b1e19e

收货单优化

 rsf-admin/src/i18n/en.js

@@ -349,6 +349,7 @@
                flagMix: "flagMix",
            },
            warehouseAreasItem: {
                asnCode: 'Order NO.',
                areaId: "areaId",
                areaName: "areaName",
                matnrId: "matnrId",

 rsf-admin/src/i18n/zh.js

@@ -351,6 +351,7 @@
                flagMix: "混放",
            },
            warehouseAreasItem: {
                asnCode: '单号',
                areaId: "仓库区域",
                areaName: "区域名称    ",
                matnrId: "物料标识",

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

@@ -165,13 +165,8 @@
            <TextField source="trackCode" label="table.field.asnOrderItem.barcode" />
            <TextField source="packName" label="table.field.asnOrderItem.packName" />
            <DateField source="updateTime" label="common.field.updateTime" showTime />
            <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
              <TextField source="nickname" />
            </ReferenceField>
            <DateField source="updateTime" label="common.field.updateTime" showTime />
            <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
              <TextField source="nickname" />
            </ReferenceField>
            <TextField source="updateBy$" label="common.field.updateBy"  />
            <TextField source="createBy$" label="common.field.createBy"  />
            <DateField source="createTime" label="common.field.createTime" showTime />
            <TextField source="memo" label="common.field.memo" sortable={false} />
          </StyledDatagrid>

 rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx

@@ -125,11 +125,12 @@
            >
                <StyledDatagrid
                    preferenceKey='warehouseAreasItem'
                    bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
                    bulkActionButtons={false}
                    rowClick={(id, resource, record) => false}
                    omit={['id', 'createTime', 'memo', 'areaId', 'brand',  'createBy$', 'weight', 'matnrId', 'batch', 'shipperId', 'splrId']}
                >
                    <NumberField source="id" />
                    <TextField source="asnCode" label="table.field.warehouseAreasItem.asnCode" />
                    <NumberField source="areaId" label="table.field.warehouseAreasItem.areaId" />
                    <TextField source="areaName" label="table.field.warehouseAreasItem.areaName" />
                    <NumberField source="matnrId" label="table.field.warehouseAreasItem.matnrId" />

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java

@@ -808,6 +808,9 @@
     */
    @Override
    public R getItemByContainer(Map<String, Object> params) {
        if (Objects.isNull(params.get("code"))) {
            throw new CoolException("参数不能为空！！");
        }
        //获取组拖未生成任务的组拖档
        List<Short> asList = Arrays.asList(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val), Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
        Short flagDefect = 0;

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

@@ -212,8 +212,8 @@
        /**对任务明细按任务主单进行分组*/
        listMap.keySet().forEach(key -> {
            List<TaskItem> items = listMap.get(key);
            //更新库位明细
            try {
                //更新库位明细
                saveLocItem(items, key);
            } catch (Exception e) {
                throw new CoolException("库位明细更新失败！！");
@@ -231,10 +231,10 @@
                throw new CoolException("数据错误：组拖数据不存在，请联系管理员！！");
            }
            List<TaskItem> items = orderMap.get(key);
            //保存库存明细
            try {
                //保存库存明细
                saveStockItems(items, pakinItem);
                //移出收货区库存
                //移出收货区库存， 修改组托状态
                removeReceiptStock(pakinItem);
            } catch (Exception e) {
                throw new CoolException("库存管理保存更新失败！！");