1. 任务历史档报错问题修复 2. 单据添加收货单明细不显示问题修复

skyouc

8 天以前 1e7849282875b5bcd237d93f7b496aecb6ede4b6

1. 任务历史档报错问题修复
2. 单据添加收货单明细不显示问题修复

 rsf-admin/src/i18n/zh.js

@@ -568,18 +568,18 @@
                spec: "规格",
                model: "型号",
                matnrCode: "物料编码",
                anfme: "计划收货数",
                stockUnit: "库存单位",
                anfme: "计划数",
                stockUnit: "单位",
                isptResult: "质检结果",
                purQty: "采购量",
                purUnit: "采购单位",
                unit: '单位',
                qty: "完成数量",
                qty: "完成数",
                safeQty: '合格数',
                disQty: '不合格数',
                splrBatch: "供应商批次",
                splrBatch: "批次",
                splrCode: "供应商编码",
                splrName: "供应商名称",
                splrName: "供应商",
                qrcode: "二维码",
                barcode: "条形码",
                packName: "包装",

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

@@ -123,7 +123,7 @@
          actions={(
            <TopToolbar>
              <FilterButton />
              <MyCreateButton onClick={() => { setCreateDialog(true) }} />
              {/* <MyCreateButton onClick={() => { setCreateDialog(true) }} /> */}
              <SelectColumnsButton preferenceKey='asnOrderItem' />
              {/* <MyExportButton /> */}
            </TopToolbar>
@@ -133,10 +133,11 @@
          <StyledDatagrid
            preferenceKey='asnOrderItem'
            bulkActionButtons={false}
            rowClick={(id, resource, record) => {
              setSelect(record)
              setEditDialog(true)
            }}
            rowClick={false}
            // rowClick={(id, resource, record) => {
            //   setSelect(record)
            //   setEditDialog(true)
            // }}
            omit={['id', 'createTime', 'purQty', 'purUnit', 'poDetlCode', 'createBy', 'memo', 'model', 'packName', 'splrCode', 'qrcode', 'poDetlId', 'matnrId', 'asnId']}
          >
            <NumberField source="id" />

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

@@ -434,13 +434,6 @@
    const notify = useNotify();

    const [columns, setColumns] = useState([

        {
            field: 'maktx',
            headerName: translate('table.field.asnOrderItem.maktx'),
            width: 250,
            editable: false,
        },
        {
            field: 'matnrCode',
            headerName: translate('table.field.asnOrderItem.matnrCode'),
@@ -448,6 +441,12 @@
            editable: false,
        },
        {
            field: 'maktx',
            headerName: translate('table.field.asnOrderItem.maktx'),
            width: 250,
            editable: false,
        },
        {
            field: 'anfme',
            headerName: translate('table.field.asnOrderItem.anfme') + "*",
            type: 'number',

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

@@ -183,8 +183,8 @@
    const notify = useNotify();
    const [columns, setColumns] = useState([
        // { field: 'id', headerName: 'ID', width: 100 },
        { field: 'name', headerName: translate('table.field.matnr.name'), width: 300 },
        { field: 'code', headerName: translate('table.field.matnr.code'), width: 200 },
        { field: 'name', headerName: translate('table.field.matnr.name'), width: 300 },
        { field: 'groupId$', headerName: translate('table.field.matnr.groupId'), width: 100 },
        { field: 'spec', headerName: translate('table.field.matnr.spec'), width: 100 },
        { field: 'model', headerName: translate('table.field.matnr.model'), width: 100 },

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

@@ -30,7 +30,9 @@
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<TaskLog, BaseParam> pageParam = new PageParam<>(baseParam, TaskLog.class);
        return R.ok().add(taskLogService.page(pageParam, pageParam.buildWrapper(true)));
//        PageParam<TaskLog, BaseParam> logs = taskLogService.page(pageParam, pageParam.buildWrapper(true));
        return R.ok(taskLogService.page(pageParam, pageParam.buildWrapper(true)));
//        return R.ok().add(taskLogService.page(pageParam, pageParam.buildWrapper(true)));
    }

    @PreAuthorize("hasAuthority('manager:taskLog:list')")

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java

@@ -258,7 +258,7 @@
        DictData dictDatas = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
                .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_TASK_TYPE)
                .eq(DictData::getValue, this.taskType));
        if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
        if (Cools.isEmpty(dictDatas)) {
            return null;
        }
        return dictDatas.getLabel();

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

@@ -163,7 +163,7 @@
     * @time 2025/4/7 13:28
     */
    @Transactional(rollbackFor = Exception.class)
    private void svaeOrUpdateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception{
    public void svaeOrUpdateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception{
        AsnOrder orders = params.getOrders();
        params.getItems().forEach(item -> {
            item.put("asnId", orders.getId());

 rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml

@@ -57,7 +57,7 @@
                    aoi.memo
                FROM
                    man_asn_order_item aoi
                        INNER JOIN man_qly_ispt_item qii ON aoi.id = qii.asn_item_id
                        LEFT JOIN man_qly_ispt_item qii ON aoi.id = qii.asn_item_id
            ) t
        ${ew.customSqlSegment}
    </select>