From 587def8f1f1cb312db5fc685a18c2a87b9e163be Mon Sep 17 00:00:00 2001
From: hy2250089 <hy2250089@qq.com>
Date: Mon, 23 Mar 2020 19:06:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=B5=8B=E7=AD=89=E7=BA=A7=E5=BA=93?=
 =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B=E9=95=BF=E5=BA=A6=E3=80=81=E7=BC=A9=E7=8E=87=E7=AD=89?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ProductBatchDetectMapper.xml       |  6 +-
 .../manage/model/ProductBatchDetect.java      | 95 +++++++++++++++++++
 .../src/test/java/BillCodeGenerator.java      |  5 +-
 3 files changed, 101 insertions(+), 5 deletions(-)

diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductBatchDetectMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductBatchDetectMapper.xml
index 7c4e622..7fcc092 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductBatchDetectMapper.xml
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductBatchDetectMapper.xml
@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
     -->
-    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="id" jdbcType="INTEGER" property="id" />
     <result column="operator_id" jdbcType="INTEGER" property="operatorId" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
@@ -15,6 +15,10 @@
     <result column="batch_det_id" jdbcType="INTEGER" property="batchDetId" />
     <result column="batch_det_code" jdbcType="VARCHAR" property="batchDetCode" />
     <result column="grade" jdbcType="INTEGER" property="grade" />
+    <result column="len" jdbcType="REAL" property="len" />
+    <result column="delivery_len" jdbcType="REAL" property="deliveryLen" />
+    <result column="detection_len" jdbcType="REAL" property="detectionLen" />
+    <result column="shrinkage" jdbcType="VARCHAR" property="shrinkage" />
     <result column="winding_machine_id" jdbcType="INTEGER" property="windingMachineId" />
     <result column="company_id" jdbcType="INTEGER" property="companyId" />
   </resultMap>
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetect.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetect.java
index 92f2ae3..46a0a0e 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetect.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetect.java
@@ -62,6 +62,28 @@ public class ProductBatchDetect {
      */
     private Integer grade;
 
+    /**
+     * 原先提供长度，单位米
+     */
+    private Float len;
+
+    /**
+     * 配送长度，单位米
+     */
+    @Column(name = "delivery_len")
+    private Float deliveryLen;
+
+    /**
+     * 现有检测长度
+     */
+    @Column(name = "detection_len")
+    private Float detectionLen;
+
+    /**
+     * 缩率%，现有检测长度/原先长度
+     */
+    private String shrinkage;
+
     /**
      * 打卷机id，关联表：mt_alone_winding_machine
      */
@@ -229,6 +251,79 @@ public class ProductBatchDetect {
         this.grade = grade;
     }
 
+    /**
+     * 获取原先提供长度，单位米
+     *
+     * @return len - 原先提供长度，单位米
+     */
+    public Float getLen() {
+        return len;
+    }
+
+    /**
+     * 设置原先提供长度，单位米
+     *
+     * @param len 原先提供长度，单位米
+     */
+    public void setLen(Float len) {
+        this.len = len;
+    }
+
+    /**
+     * 获取配送长度，单位米
+     *
+     * @return delivery_len - 配送长度，单位米
+     */
+    public Float getDeliveryLen() {
+        return deliveryLen;
+    }
+
+    /**
+     * 设置配送长度，单位米
+     *
+     * @param deliveryLen 配送长度，单位米
+     */
+    public void setDeliveryLen(Float deliveryLen) {
+        this.deliveryLen = deliveryLen;
+    }
+
+    /**
+     * 获取现有检测长度
+     *
+     * @return detection_len - 现有检测长度
+     */
+    public Float getDetectionLen() {
+        return detectionLen;
+    }
+
+    /**
+     * 设置现有检测长度
+     *
+     * @param detectionLen 现有检测长度
+     */
+    public void setDetectionLen(Float detectionLen) {
+        this.detectionLen = detectionLen;
+    }
+
+    /**
+     * 获取缩率%，现有检测长度/原先长度
+     *
+     * @return shrinkage - 缩率%，现有检测长度/原先长度
+     */
+    public String getShrinkage() {
+        return shrinkage;
+    }
+
+    /**
+     * 设置缩率%，现有检测长度/原先长度
+     *
+     * @param shrinkage 缩率%，现有检测长度/原先长度
+     */
+    public void setShrinkage(String shrinkage) {
+        this.shrinkage = shrinkage;
+    }
+
+
     /**
      * 获取打卷机id，关联表：mt_alone_winding_machine
      *
diff --git a/wms-produce-manage/src/test/java/BillCodeGenerator.java b/wms-produce-manage/src/test/java/BillCodeGenerator.java
index 339f37f..e37f60c 100644
--- a/wms-produce-manage/src/test/java/BillCodeGenerator.java
+++ b/wms-produce-manage/src/test/java/BillCodeGenerator.java
@@ -22,11 +22,8 @@ public class BillCodeGenerator {
         configurer.setModuleName("/wms-ware-task");
 
         //设置需要生成的表
-         configurer.getTables().add(new Table("mt_alone_materials_info",null,"id","Integer"));
+         configurer.getTables().add(new Table("mt_alone_product_batch_detect",null,"id","Integer"));
 
-        configurer.getTables().add(new Table("mt_alone_product_process_bom",null,"id","Integer"));
-
-        configurer.getTables().add(new Table("mt_alone_process_bom",null,"id","Integer"));
         //生成代码
         Generator.genCode(configurer);
     }