#

Junjie

2024-08-09 fe286cb7f411527b3c1474831fd62c2ac5e3b073

#

 zy-asrs-admin/src/views/base/mat/edit.vue

@@ -225,6 +225,18 @@
                    style="width: 250px;">
                    <a-input v-model:value="formData.deadTime" />
                </a-form-item>
                <a-form-item :label="formatMessage('db.man_mat.safeStockLimit', '安全库存上限')" name="safeStockLimit"
                    style="width: 250px;">
                    <a-input v-model:value="formData.safeStockLimit" />
                </a-form-item>
                <a-form-item :label="formatMessage('db.man_mat.safeStockMinimum', '安全库存下限')" name="safeStockMinimum"
                    style="width: 250px;">
                    <a-input v-model:value="formData.safeStockMinimum" />
                </a-form-item>
                <a-form-item :label="formatMessage('db.man_mat.validity', '有效期')" name="validity"
                    style="width: 250px;">
                    <a-input v-model:value="formData.validity" />
                </a-form-item>
                <a-form-item :label="formatMessage('db.man_mat.flag', '标识')" name="flag" style="width: 250px;">
                    <a-input v-model:value="formData.flag" />
                </a-form-item>
@@ -242,7 +254,8 @@
                    <a-input v-model:value="formData.memo" />
                </a-form-item>

                <a-form-item v-for="(item, index) in extendField" :key="index" :label="formatMessage(item.language, item.describe)" :name="item.name" style="width: 250px;">
                <a-form-item v-for="(item, index) in extendField" :key="index"
                    :label="formatMessage(item.language, item.describe)" :name="item.name" style="width: 250px;">
                    <a-input v-model:value="formData[item.name]" />
                </a-form-item>


 zy-asrs-admin/src/views/base/mat/index.vue

@@ -221,6 +221,27 @@
    ellipsis: true,
    ...getColumnSearchProps('deadTime'),
  },
  {
    title: formatMessage('db.man_mat.safeStockLimit', '安全库存上限'),
    dataIndex: 'safeStockLimit',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('safeStockLimit'),
  },
  {
    title: formatMessage('db.man_mat.safeStockMinimum', '安全库存下限'),
    dataIndex: 'safeStockMinimum',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('safeStockMinimum'),
  },
  {
    title: formatMessage('db.man_mat.validity', '有效期'),
    dataIndex: 'validity',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('validity'),
  },

  {
    title: formatMessage('db.man_mat.uuid', '编号'),

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Mat.java

@@ -249,9 +249,27 @@
    @ApiModelProperty(value= "保质期")
    private String deadTime;

    /**
     * 安全库存上限
     */
    @ApiModelProperty(value= "安全库存上限")
    private Double safeStockLimit;

    /**
     * 安全库存下限
     */
    @ApiModelProperty(value= "安全库存下限")
    private Double safeStockMinimum;

    /**
     * 有效期
     */
    @ApiModelProperty(value= "有效期")
    private String validity;

    public Mat() {}

    public Mat(String uuid,String flag,Integer sort,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo,Long tagId,String matnr,String maktx,String name,String specs,String model,String color,String brand,String unit,Double price,String sku,String units,String barcode,String origin,String manu,String manuDate,String itemNum,String weight,String length,String volume,String threeCode,String supp,String suppCode,String deadTime) {
    public Mat(String uuid, String flag, Integer sort, Long hostId, Integer status, Integer deleted, Date createTime, Long createBy, Date updateTime, Long updateBy, String memo, Long tagId, String matnr, String maktx, String name, String specs, String model, String color, String brand, String unit, Double price, String sku, String units, String barcode, String origin, String manu, String manuDate, String itemNum, String weight, String length, String volume, String threeCode, String supp, String suppCode, String deadTime, Double safeStockLimit, Double safeStockMinimum, String validity) {
        this.uuid = uuid;
        this.flag = flag;
        this.sort = sort;
@@ -287,6 +305,9 @@
        this.supp = supp;
        this.suppCode = suppCode;
        this.deadTime = deadTime;
        this.safeStockLimit = safeStockLimit;
        this.safeStockMinimum = safeStockMinimum;
        this.validity = validity;
    }

//    Mat mat = new Mat(