Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

2025-04-02 65529902083f0c2c8ef86576a104880827be1884

Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

 rsf-admin/src/i18n/en.js

@@ -436,6 +436,7 @@
                disQty: "disQty",
                safeQty: "safeQty",
                picPath: "picPath",
                trackCode: "trackCode",
            },
            dictType: {
                code: "Code",

 rsf-admin/src/i18n/zh.js

@@ -422,7 +422,7 @@
            qlyInspect: {
                asnId: "收货通知单号",
                asnCode: "收货通知单编码",
                code: "编码",
                code: "质检单编码",
                wkType: "业务类型",
                safeQty: "合格数量",
                dlyQty: "送货数量",
@@ -445,6 +445,7 @@
                disQty: "不合数量",
                safeQty: "合格数量",
                picPath: "图片路径",
                trackCode: "条形码",
            },
            dictType: {
                code: "字典编码",
@@ -520,7 +521,7 @@
                poDetlCode: "PO单编码",
                matnrId: "物料标识",
                maktx: "物料名称",
                maktxCode: "物料编码",
                matnrCode: "物料编码",
                anfme: "数量",
                stockUnit: "库存单位",
                purQty: "计划收货数量",

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

@@ -264,8 +264,8 @@
            editable: false,
        },
        {
            field: 'maktxCode',
            headerName: translate('table.field.asnOrderItem.maktxCode'),
            field: 'matnrCode',
            headerName: translate('table.field.asnOrderItem.matnrCode'),
            width: 130,
            editable: false,
        },

 rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx

@@ -59,10 +59,10 @@
            field: 'poDetlCode',
            headerName: translate('table.field.asnOrderItem.poDetlCode')
        },
        // {
        //     field: 'matnrCode',
        //     headerName: translate('table.field.asnOrderItem.matnrCode')
        // },
        {
            field: 'matnrCode',
            headerName: translate('table.field.asnOrderItem.matnrCode')
        },
        {
            field: 'maktx',
            headerName: translate('table.field.asnOrderItem.maktx'),

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

@@ -71,7 +71,7 @@
            return {
                matnrId: el.id,
                maktx: el.name,
                maktxCode: el.code,
                matnrCode: el.code,
                stockUnit: el.stockUnit || '',
                purUnit: el.purchaseUnit || '',
                ...dynamicFields

 rsf-admin/src/page/qlyInspect/QlyInspectList.jsx

@@ -129,11 +129,11 @@
                    omit={['id', 'createTime', 'createBy', 'memo', 'asnId', 'statusBool']}
                >
                    <NumberField source="id" />
                    <NumberField source="asnId" label="table.field.qlyInspect.asnId" />
                    <NumberField source="asnCode" label="table.field.qlyInspect.asnCode" />
                    <TextField source="code" label="table.field.qlyInspect.code" />
                    <TextField source="isptStatus$" label="table.field.qlyInspect.isptStatus" />
                    <TextField source="wkType$" label="table.field.qlyInspect.wkType" />
                    <NumberField source="asnId" label="table.field.qlyInspect.asnId" />
                    <NumberField source="asnCode" label="table.field.qlyInspect.asnCode" />
                    <NumberField source="safeQty" label="table.field.qlyInspect.safeQty" />
                    <NumberField source="dlyQty" label="table.field.qlyInspect.dlyQty" />
                    <NumberField source="rcptQty" label="table.field.qlyInspect.rcptQty" />

 rsf-admin/src/page/qlyInspect/QlyInspectPanel.jsx

@@ -47,7 +47,8 @@
        },
        {
            field: 'matnrCode',
            headerName: translate('table.field.qlyIsptItem.matnrCode')
            headerName: translate('table.field.qlyIsptItem.matnrCode'),
            width: 200
        },
        {
            field: 'maktx',
@@ -55,6 +56,11 @@
            width: 200
        },
        // {
        //     field: 'trackCode',
        //     headerName: translate('table.field.qlyIsptItem.trackCode'),
        //     width: 200
        // },
        // {
        //     field: 'label',
        //     headerName: translate('table.field.qlyIsptItem.label')
        // },

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

@@ -135,7 +135,7 @@
                    <NumberField source="matnrId" label="table.field.warehouseAreasItem.matnrId" />
                    <TextField source="matnrName" label="table.field.warehouseAreasItem.matnrName" />
                    <TextField source="matnrCode" label="table.field.warehouseAreasItem.matnrCode" />
                    <TextField source="trackCode" label="table.field.warehouseAreasItem.barcode" />
                    <TextField source="barcode" label="table.field.warehouseAreasItem.barcode" />
                    <NumberField source="anfme" label="table.field.warehouseAreasItem.anfme" />
                    <TextField source="batch" label="table.field.warehouseAreasItem.batch" />
                    <TextField source="unit" label="table.field.warehouseAreasItem.unit" />

 rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java

New file
@@ -0,0 +1,49 @@
package com.vincent.rsf.server.common;


import com.vincent.rsf.framework.generators.ReactGenerator;
import com.vincent.rsf.framework.generators.constant.SqlOsType;

/**
 * Created by vincent on 2019-06-04
 */
public class CodeBuilder {

    public static void main(String[] args) throws Exception {
        ReactGenerator generator = new ReactGenerator();
        generator.backendPrefixPath = "rsf-server/";
        generator.frontendPrefixPath = "rsf-admin/";

        generator.sqlOsType = SqlOsType.MYSQL;
        generator.url="192.168.4.24:3306/rsf";
        generator.username="root";
        generator.password="34821015";
//        generator.url="47.97.1.152:51433;databasename=jkasrs";
//        generator.username="sa";
//        generator.password="Zoneyung@zy56$";

        generator.table="man_ispt_histories";
        generator.tableDesc="任务工作档";
        generator.packagePath="com.vincent.rsf.server.manager";

        generator.build();
    }
/*
 CREATE TABLE `man_tablename` (
 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'ID',
 `code` VARCHAR(255) DEFAULT NULL COMMENT '编号',
 `name` VARCHAR(255) DEFAULT NULL COMMENT '名称(*)',
 `status` INT(1) NOT NULL DEFAULT '1' COMMENT '状态{1:正常,0:冻结}',
 `deleted` INT(1) NOT NULL DEFAULT '0' COMMENT '是否删除{1:是,0:否}',
 `tenant_id` INT(11) DEFAULT NULL COMMENT '租户[sys_tenant]',
 `create_by` BIGINT(20) DEFAULT NULL COMMENT '添加人员[sys_user]',
 `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
 `update_by` BIGINT(20) DEFAULT NULL COMMENT '修改人员[sys_user]',
 `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
 `memo` VARCHAR(255) DEFAULT NULL COMMENT '备注',
 PRIMARY KEY (`id`)
 ) ENGINE=INNODB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8;
 */

}


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

@@ -59,6 +59,9 @@
            throw new CoolException("ASN单据不能为空！！");
        }
        List<PoItemsDto> items = purchaseMapper.poList(asnIds);
        if (items.isEmpty()) {
            throw new CoolException("物料所属采购单据不存在！！");
        }
        if (reportMsgService.reportInspectNotify(items)) {
            return true;
        } else {
@@ -74,7 +77,6 @@
        List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
                .like(!Objects.isNull(params.get("maktx")), AsnOrderItem::getMaktx, params.get("maktx"))
                .eq(!Objects.isNull(params.get("matnrCode")), AsnOrderItem::getMatnrCode, params.get("matnrCode")));

        if (orderItems.isEmpty()) {
            return new ArrayList<>();
        }