一些设计文档

ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProWorkorder.java

@@ -57,6 +57,10 @@ public class ProWorkorder extends TreeEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 批次号 */
+    @Excel(name = "批次号")
+    private String batchCode;
+
     /** 生产数量 */
     @Excel(name = "生产数量")
     private BigDecimal quantity;
@@ -264,7 +268,15 @@ public class ProWorkorder extends TreeEntity
         this.requestDate = requestDate;
     }
 
-    public Date getRequestDate() 
+    public String getBatchCode() {
+        return batchCode;
+    }
+
+    public void setBatchCode(String batchCode) {
+        this.batchCode = batchCode;
+    }
+
+    public Date getRequestDate()
     {
         return requestDate;
     }
@@ -314,39 +326,34 @@ public class ProWorkorder extends TreeEntity
         return attr4;
     }
 
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+        return "ProWorkorder{" +
-            .append("workorderId", getWorkorderId())
+                "workorderId=" + workorderId +
-            .append("workorderCode", getWorkorderCode())
+                ", workorderCode='" + workorderCode + '\'' +
-            .append("workorderName", getWorkorderName())
+                ", workorderName='" + workorderName + '\'' +
-            .append("orderSource", getOrderSource())
+                ", orderSource='" + orderSource + '\'' +
-            .append("sourceCode", getSourceCode())
+                ", sourceCode='" + sourceCode + '\'' +
-            .append("productId", getProductId())
+                ", productId=" + productId +
-            .append("productCode", getProductCode())
+                ", productCode='" + productCode + '\'' +
-            .append("productName", getProductName())
+                ", productName='" + productName + '\'' +
-            .append("productSpc", getProductSpc())
+                ", productSpc='" + productSpc + '\'' +
-            .append("unitOfMeasure", getUnitOfMeasure())
+                ", unitOfMeasure='" + unitOfMeasure + '\'' +
-            .append("quantity", getQuantity())
+                ", batchCode='" + batchCode + '\'' +
-            .append("quantityProduced", getQuantityProduced())
+                ", quantity=" + quantity +
-            .append("quantityChanged", getQuantityChanged())
+                ", quantityProduced=" + quantityProduced +
-            .append("quantityScheduled", getQuantityScheduled())
+                ", quantityChanged=" + quantityChanged +
-            .append("clientId", getClientId())
+                ", quantityScheduled=" + quantityScheduled +
-            .append("clientCode", getClientCode())
+                ", clientId=" + clientId +
-            .append("clientName", getClientName())
+                ", clientCode='" + clientCode + '\'' +
-            .append("requestDate", getRequestDate())
+                ", clientName='" + clientName + '\'' +
-            .append("parentId", getParentId())
+                ", requestDate=" + requestDate +
-            .append("ancestors", getAncestors())
+                ", status='" + status + '\'' +
-            .append("status", getStatus())
+                ", attr1='" + attr1 + '\'' +
-            .append("remark", getRemark())
+                ", attr2='" + attr2 + '\'' +
-            .append("attr1", getAttr1())
+                ", attr3=" + attr3 +
-            .append("attr2", getAttr2())
+                ", attr4=" + attr4 +
-            .append("attr3", getAttr3())
+                '}';
-            .append("attr4", getAttr4())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
     }
 }

ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcMobResult.java

@@ -0,0 +1,7 @@
+package com.ktg.mes.qc.domain;
+
+import com.ktg.common.core.domain.BaseEntity;
+
+public class QcMobResult extends BaseEntity {
+
+}

ktg-mes/src/main/resources/mapper/pro/ProWorkorderMapper.xml

@@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="productName"    column="product_name"    />
         <result property="productSpc"    column="product_spc"    />
         <result property="unitOfMeasure"    column="unit_of_measure"    />
+        <result property="batchCode" column="batch_code"></result>
         <result property="quantity"    column="quantity"    />
         <result property="quantityProduced"    column="quantity_produced"    />
         <result property="quantityChanged"    column="quantity_changed"    />
@@ -38,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectProWorkorderVo">
-        select workorder_id, workorder_code, workorder_name, order_source, source_code, product_id, product_code, product_name, product_spc, unit_of_measure, quantity, client_id, client_code, client_name, request_date, parent_id, ancestors, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_workorder
+        select workorder_id, workorder_code, workorder_name, order_source, source_code, product_id, product_code, product_name, product_spc, unit_of_measure,batch_code, quantity, client_id, client_code, client_name, request_date, parent_id, ancestors, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_workorder
     </sql>
 
     <select id="selectProWorkorderList" parameterType="ProWorkorder" resultMap="ProWorkorderResult">
@@ -53,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
             <if test="productSpc != null  and productSpc != ''"> and product_spc = #{productSpc}</if>
             <if test="unitOfMeasure != null  and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
+            <if test="batchCode !=null and batchCode !=''" >and batch_code = #{batchCode}</if>
             <if test="quantity != null "> and quantity = #{quantity}</if>
             <if test="quantityProduced != null "> and quantity_produced = #{quantityProduced}</if>
             <if test="quantityChanged != null "> and quantity_changed = #{quantityChanged}</if>
@@ -89,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="productName != null and productName != ''">product_name,</if>
             <if test="productSpc != null">product_spc,</if>
             <if test="unitOfMeasure != null and unitOfMeasure != ''">unit_of_measure,</if>
+            <if test="batchCode !=null and batchCode !=''" >batch_code,</if>
             <if test="quantity != null">quantity,</if>
             <if test="quantityProduced != null">quantity_produced,</if>
             <if test="quantityChanged != null">quantity_changed,</if>
@@ -120,6 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="productName != null and productName != ''">#{productName},</if>
             <if test="productSpc != null">#{productSpc},</if>
             <if test="unitOfMeasure != null and unitOfMeasure != ''">#{unitOfMeasure},</if>
+            <if test="batchCode !=null and batchCode !=''" >#{batchCode},</if>
             <if test="quantity != null">#{quantity},</if>
             <if test="quantityProduced != null">#{quantityProduced},</if>
             <if test="quantityChanged != null">#{quantityChanged},</if>
@@ -155,6 +159,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="productName != null and productName != ''">product_name = #{productName},</if>
             <if test="productSpc != null">product_spc = #{productSpc},</if>
             <if test="unitOfMeasure != null and unitOfMeasure != ''">unit_of_measure = #{unitOfMeasure},</if>
+            <if test="batchCode !=null and batchCode !=''" >batch_code = #{batchCode},</if>
             <if test="quantity != null">quantity = #{quantity},</if>
             <if test="quantityProduced != null">quantity_produced = #{quantityProduced},</if>
             <if test="quantityChanged != null">quantity_changed = #{quantityChanged},</if>

ktg-mes/src/main/resources/mapper/wm/WmBarcodeMapper.xml

@@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where barcode_id = #{barcodeId}
     </select>
 
-    <select id="checkBarcodeUnique" parameterType="WmBarcode">
+    <select id="checkBarcodeUnique" parameterType="WmBarcode" resultMap="WmBarcodeResult">
         <include refid="selectWmBarcodeVo"/>
         where bussiness_id = #{bussinessId} and barcode_type = #{barcodeType}
     </select>