问题清单问题修复

skyouc

2025-05-14 77fa480130597d386c13c72d2ed091212722c130

问题清单问题修复

 rsf-admin/src/i18n/zh.js

@@ -749,12 +749,12 @@
            },
            deviceSite: {
                type: "入出库类型",
                site: "作业站点",
                site: "入库口",
                name: "名称",
                target: "目标站点",
                label: "站点标签",
                device: "立库类型",
                deviceCode: "设备编号",
                deviceCode: "接驳位",
                deviceSite: "设备站点",
                flagInit: "是否初始化",
                wcsCode: "wcs编号",

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

@@ -162,7 +162,7 @@
            </>}
          rowClick={false}
          expandSingle={true}
          omit={['id', 'createTime', 'createBy', 'memo', 'poId', 'rleStatus$']}
          omit={['id', 'createTime', 'createBy', 'memo', 'logisNo', 'poId', 'rleStatus$']}
        >
          <NumberField source="id" />
          <TextField source="code" label="table.field.asnOrder.code" />
@@ -174,6 +174,7 @@
          <NumberField source="qty" label="table.field.asnOrder.qty" />
          <DateField source="arrTime" label="table.field.asnOrder.arrTime" showTime />
          <TextField source="rleStatus$" label="table.field.asnOrder.rleStatus" sortable={false} />
          <TextField source="logisNo" label="table.field.asnOrder.logisNo" />
          {/* <TextField source="ntyStatus$" label="table.field.asnOrder.ntyStatus" /> */}
          <TextField source="updateBy$" label="common.field.updateBy" />
          <DateField source="updateTime" label="common.field.updateTime" showTime />

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

@@ -134,6 +134,7 @@
                    .setMemo(template.getMemo())
                    .setArrTime(date)
                    .setUpdateBy(loginUserId)
                    .setLogisNo(template.getLogicNo())
                    .setCreateBy(loginUserId)
                    .setType(OrderType.getTypeVal(template.getType()))
                    .setWkType(OrderWorkType.getWorkType(template.getWkType()));

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

@@ -362,9 +362,9 @@
                PurchaseItem purchaseItem = purchaseItemService.getById(item.getPoDetlId());
                if (!Objects.isNull(purchaseItem)) {
                    purchaseItem.setQty(purchaseItem.getQty() - item.getAnfme());
                }
                if (!purchaseItemService.updateById(purchaseItem)) {
                    throw new CoolException("PO单明细更新失败！！");
                    if (!purchaseItemService.updateById(purchaseItem)) {
                        throw new CoolException("PO单明细更新失败！！");
                    }
                }
            });

@@ -372,11 +372,13 @@

            Purchase purchase = purchaseService.getOne(new LambdaQueryWrapper<Purchase>()
                    .eq(Purchase::getCode, list.stream().findFirst().get().getPoCode()));
            purchase.setQty(purchase.getQty() - sum)
                    .setExceStatus(POExceStatus.PO_EXCE_STATUS_EXCE_ING.val);
            if (!Objects.isNull(purchase)) {
                purchase.setQty(purchase.getQty() - sum)
                        .setExceStatus(POExceStatus.PO_EXCE_STATUS_EXCE_ING.val);

            if (!purchaseService.updateById(purchase)) {
                throw new CoolException("PO单据更新失败！！");
                if (!purchaseService.updateById(purchase)) {
                    throw new CoolException("PO单据更新失败！！");
                }
            }
        }


 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/BaseController.java

@@ -17,6 +17,8 @@

public class BaseController {



    public User getLoginUser() {
        try {
            Authentication authentication = SecurityContextHolder.getContext().getAuthentication();