From 72733213bb757dd958db2a77f320efffca2735e2 Mon Sep 17 00:00:00 2001
From: xs <xins@mesnac.com>
Date: Sun, 19 May 2024 16:38:07 +0800
Subject: [PATCH] =?UTF-8?q?2.2.5=20MES=EF=BC=9A=E7=89=A9=E6=96=99=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=A2=9E=E5=8A=A0=E6=89=B9=E6=AC=A1=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E5=92=8C=E7=BB=91=E5=AE=9A=E6=A0=87=E8=AF=86=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/api/domain/MesBaseMaterialInfo.java   | 26 +++++++++++++++++++
 .../mapper/mes/MesBaseMaterialInfoMapper.xml  |  4 +++
 2 files changed, 30 insertions(+)

diff --git a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseMaterialInfo.java b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseMaterialInfo.java
index 57c2554..293de8d 100644
--- a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseMaterialInfo.java
+++ b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseMaterialInfo.java
@@ -57,6 +57,10 @@ public class MesBaseMaterialInfo extends BaseEntity
     @Excel(name = "批次标识，(0否，1是)")
     private String batchFlag;
 
+    /** 批次数量，例如一袋螺丝有60个 */
+    @Excel(name = "批次数量，例如一袋螺丝有60个")
+    private BigDecimal batchAmount;
+
     /** 计量单位ID;对应FBaseUnitId */
     @Excel(name = "计量单位ID;对应FBaseUnitId")
     private Long materialUnitId;
@@ -81,6 +85,10 @@ public class MesBaseMaterialInfo extends BaseEntity
     @Excel(name = "毛重;FGROSSWEIGHT")
     private BigDecimal grossWeight;
 
+    /** 绑定标识(1是，0否)，如果需要绑定，则需要将销售订单绑定具体的采购订单明细 */
+    @Excel(name = "绑定标识(1是，0否)，如果需要绑定，则需要将销售订单绑定具体的采购订单明细")
+    private String bindFlag;
+
     /** 所属工厂，关联mes_base_factory_info的factory_id */
     @Excel(name = "所属工厂，关联mes_base_factory_info的factory_id")
     private Long factoryId;
@@ -206,6 +214,15 @@ public class MesBaseMaterialInfo extends BaseEntity
     {
         return batchFlag;
     }
+
+    public BigDecimal getBatchAmount() {
+        return batchAmount;
+    }
+
+    public void setBatchAmount(BigDecimal batchAmount) {
+        this.batchAmount = batchAmount;
+    }
+
     public void setMaterialUnitId(Long materialUnitId)
     {
         this.materialUnitId = materialUnitId;
@@ -260,6 +277,15 @@ public class MesBaseMaterialInfo extends BaseEntity
     {
         return grossWeight;
     }
+
+    public String getBindFlag() {
+        return bindFlag;
+    }
+
+    public void setBindFlag(String bindFlag) {
+        this.bindFlag = bindFlag;
+    }
+
     public void setFactoryId(Long factoryId)
     {
         this.factoryId = factoryId;
diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml
index 5cc219a..5cb5d7a 100644
--- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml
+++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml
@@ -15,12 +15,14 @@
         <result property="materialTypeId" column="material_type_id"/>
         <result property="materialTypeName" column="material_type_name"/>
         <result property="batchFlag" column="batch_flag"/>
+        <result property="batchAmount"    column="batch_amount"    />
         <result property="materialUnitId" column="material_unit_id"/>
         <result property="materialUnit" column="material_unit"/>
         <result property="materialMatkl" column="material_matkl"/>
         <result property="materialSpec" column="material_spec"/>
         <result property="netWeight" column="net_weight"/>
         <result property="grossWeight" column="gross_weight"/>
+        <result property="bindFlag"    column="bind_flag"    />
         <result property="factoryId" column="factory_id"/>
         <result property="createOrgId" column="create_org_id"/>
         <result property="useOrgId" column="use_org_id"/>
@@ -207,6 +209,8 @@
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="approveDate != null">approve_date = #{approveDate},</if>
             <if test="erpModifyDate != null">erp_modify_date = #{erpModifyDate},</if>
+            <if test="bindFlag != null">bind_flag = #{bindFlag},</if>
+            <if test="batchAmount != null">batch_amount = #{batchAmount},</if>
         </trim>
         where material_id = #{materialId}
     </update>