From eaf53ba78c4d2af35f6fd647d369d4ea95391ba3 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 26 Mar 2025 17:33:06 +0800 Subject: [PATCH] =?UTF-8?q?2025-03-26=20=E5=A4=87=E5=93=81=E5=A4=87?= =?UTF-8?q?=E4=BB=B6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xujie/sys/modules/pms/entity/PartSpareEntity.java | 2 ++ .../com/xujie/sys/modules/pms/entity/vo/PartSpareVo.java | 2 ++ src/main/resources/mapper/pms/PartSpareMapper.xml | 6 ++++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/xujie/sys/modules/pms/entity/PartSpareEntity.java b/src/main/java/com/xujie/sys/modules/pms/entity/PartSpareEntity.java index eb8fd9b9..1d83ca0e 100644 --- a/src/main/java/com/xujie/sys/modules/pms/entity/PartSpareEntity.java +++ b/src/main/java/com/xujie/sys/modules/pms/entity/PartSpareEntity.java @@ -2,6 +2,7 @@ package com.xujie.sys.modules.pms.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonProperty; import com.xujie.sys.common.utils.QueryPage; import lombok.Data; @@ -266,6 +267,7 @@ public class PartSpareEntity extends QueryPage implements Serializable { /** * 是否启用序列号管理 */ + @JsonProperty("sCodeControlFlag") private String sCodeControlFlag; /** * $column.comments diff --git a/src/main/java/com/xujie/sys/modules/pms/entity/vo/PartSpareVo.java b/src/main/java/com/xujie/sys/modules/pms/entity/vo/PartSpareVo.java index 78f34e4b..a9ce0893 100644 --- a/src/main/java/com/xujie/sys/modules/pms/entity/vo/PartSpareVo.java +++ b/src/main/java/com/xujie/sys/modules/pms/entity/vo/PartSpareVo.java @@ -2,6 +2,7 @@ package com.xujie.sys.modules.pms.entity.vo; import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonProperty; import com.xujie.sys.common.utils.QueryPage; import lombok.Data; @@ -251,6 +252,7 @@ public class PartSpareVo extends QueryPage { */ private String batchCreatedMethodFlag; + @JsonProperty("sCodeControlFlag") private String sCodeControlFlag; private String locationId; diff --git a/src/main/resources/mapper/pms/PartSpareMapper.xml b/src/main/resources/mapper/pms/PartSpareMapper.xml index e2ad3a94..8eec525a 100644 --- a/src/main/resources/mapper/pms/PartSpareMapper.xml +++ b/src/main/resources/mapper/pms/PartSpareMapper.xml @@ -95,7 +95,8 @@ A.bu_no, dbo.get_bu_desc(A.site, A.bu_no) buDesc, A.coreFlag, - a.group_id + a.group_id, + a.S_code_control_flag as sCodeControlFlag from part_spare A left join warehouse as B on A.site = B.site and A.warehouse_id = B.warehouse_id left join view_supplier as c on a.site = c.site and a.supplier_id = c.SupplierID @@ -218,7 +219,8 @@ min_stock = #{minStock,jdbcType=DECIMAL}, supplier_id = #{supplierId}, warehouse_id = #{warehouseId}, - location_id = #{locationId} + location_id = #{locationId}, + S_code_control_flag = #{sCodeControlFlag} WHERE site = #{site} and bu_no = #{buNo} and part_no = #{partNo}