盘点功能代码优化

skyouc

1 天以前 d329d3764120f1caa5932f69654248331604a890

盘点功能代码优化

 rsf-admin/src/i18n/zh.js

@@ -646,7 +646,7 @@
                arrTime: "预计到达时间",
                rleStatus: "释放状态",
                ntyStatus: "上报状态",
                exceStatus: '单据状态'
                exceStatus: '执行状态'
            },
            asnOrderItem: {
                asnId: "主单标识",

 rsf-admin/src/page/components/BillStatusField.jsx

@@ -22,10 +22,7 @@
        14: '#FF4D4F',
    }
    return (
        <Typography
            variant="body2"
            sx={{ display: 'flex', alignItems: 'center' }}
        >
        <Typography variant="body2"  sx={{ display: 'flex', alignItems: 'center', }} >
            <CircleIcon sx={{ fontSize: 10, color: color[record.exceStatus || 0], marginRight: '3px' }} /> {record.exceStatus$}
        </Typography >
    )

 rsf-admin/src/page/orders/check/CheckOrderList.jsx

@@ -67,25 +67,14 @@
const filters = [
  <SearchInput source="condition" alwaysOn />,
  <TextInput source="code" label="table.field.checkOrder.code" alwaysOn />,
  <TextInput source="poCode" label="table.field.checkOrder.poCode" />,
  <NumberInput source="poId" label="table.field.checkOrder.poId" />,
  <ReferenceInput source="type" reference="dictData" filter={{ dictTypeCode: 'sys_order_type', group: '3' }} label="table.field.checkOrder.type" alwaysOn>
    <AutocompleteInput label="table.field.checkOrder.type" optionValue="value" />
  </ReferenceInput>,
  <ReferenceInput source="wkType" reference="dictData" filter={{ dictTypeCode: 'sys_check_order_type' }} label="table.field.checkOrder.wkType" alwaysOn>
    <AutocompleteInput label="table.field.checkOrder.wkType" optionValue="value" />
  <ReferenceInput source="wkType" reference="dictData" filter={{ dictTypeCode: 'sys_check_order_type' }} label="table.field.checkOrder.checkType" alwaysOn>
    <AutocompleteInput label="table.field.checkOrder.checkType" optionValue="value" />
  </ReferenceInput>,
  <NumberInput source="anfme" label="table.field.checkOrder.anfme" />,
  <NumberInput source="qty" label="table.field.checkOrder.qty" />,
  <TextInput source="logisNo" label="table.field.checkOrder.logisNo" />,
  <DateInput source="arrTime" label="table.field.checkOrder.arrTime" />,
  <SelectInput source="rleStatus" label="table.field.checkOrder.rleStatus"
    choices={[
      { id: 0, name: ' 正常' },
      { id: 1, name: ' 已释放' },
    ]}
  />,

  <TextInput label="common.field.memo" source="memo" />,
  <DictionarySelect
    label='table.field.checkOrder.exceStatus'
@@ -143,7 +132,7 @@
            <FilterButton />
            <MyCreateButton onClick={() => { setManualDialog(true); setmodalType(0) }} />
            <SelectColumnsButton preferenceKey='check' />
            <ImportButton value={'checkItem'} />
            <ImportButton value={'check'} />
          </TopToolbar>
        )}
        perPage={DEFAULT_PAGE_SIZE}
@@ -162,7 +151,7 @@
          <NumberField source="anfme" label="table.field.checkOrder.anfme" />
          <NumberField source="workQty" label="table.field.checkOrder.workQty" />
          <NumberField source="qty" label="table.field.checkOrder.qty" />
          <TextField source="rleStatus$" label="table.field.checkOrder.rleStatus" sortable={false} />
          <DateField source="arrTime" label="table.field.checkOrder.arrTime" />
          <TextField source="updateBy$" label="common.field.updateBy" />
          <DateField source="updateTime" label="common.field.updateTime" showTime />
          <TextField source="createBy$" label="common.field.createBy" />

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

@@ -12,6 +12,8 @@
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.excel.CheckOrderTemplate;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.service.CheckOrderService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -135,7 +137,21 @@
        return checkOrderService.saveCheckOrder(params, getLoginUserId());
    }


    /**
     * @author Ryan
     * @description 下载模板
     * @param
     * @return
     * @time 2025/4/18 08:17
     */
    @PostMapping("/check/template/download")
    @ApiOperation("下载盘点单模板")
    @PreAuthorize("hasAuthority('manager:check:update')")
    public void downloadTemplate(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
        CheckOrderTemplate template = ExcelUtil.mockData(CheckOrderTemplate.class);
        List<CheckOrderTemplate> list = Arrays.asList(template);
        ExcelUtil.build(ExcelUtil.create(list, CheckOrderTemplate.class, true), response);
    }

    /**
     * 盘点单导入
@@ -152,6 +168,5 @@
        HashMap<String, Object> hashMap = new HashMap<>();
        return checkOrderService.excelImport(file, hashMap, getLoginUserId());
    }


}

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

@@ -115,38 +115,4 @@
        return R.ok().add(vos);
    }

    /**
     * @author Ryan
     * @date 2025/7/14
     * @description: 盘点单导出
     * @version 1.0
     */
    @PreAuthorize("hasAuthority('manager:check:list')")
    @PostMapping("/checkItem/export")
    public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
        List<WkOrderItem> orders = new ArrayList<>();
        if (!Objects.isNull(map.get("ids"))) {
            orders = checkOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().in(WkOrderItem::getId, map.get("ids")));
        } else {
            orders = checkOrderItemService.list();
        }
        ExcelUtil.build(ExcelUtil.create(orders, WkOrderItem.class), response);
    }

    /**
     * @author Ryan
     * @description 下载模板
     * @param
     * @return
     * @time 2025/4/18 08:17
     */
    @PostMapping("/checkItem/template/download")
    @ApiOperation("下载盘点单模板")
    @PreAuthorize("hasAuthority('manager:check:update')")
    public void downloadTemplate(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
        CheckOrderTemplate template = ExcelUtil.mockData(CheckOrderTemplate.class);
        List<CheckOrderTemplate> list = Arrays.asList(template);
        ExcelUtil.build(ExcelUtil.create(list, CheckOrderTemplate.class, true), response);
    }

}

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

File was renamed from rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
@@ -38,7 +38,7 @@

@RestController
@Api(tags = "ASN入库通知单")
public class AsnOrderController extends BaseController {
public class WkOrderController extends BaseController {

    @Autowired
    private AsnOrderService asnOrderService;

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

File was renamed from rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java
@@ -34,7 +34,7 @@

@Api(tags = "ASN单明细")
@RestController
public class AsnOrderItemController extends BaseController {
public class WkOrderItemController extends BaseController {

    @Autowired
    private AsnOrderItemService asnOrderItemService;