Merge remote-tracking branch '惠信/feature/NoScanning' into feature/NoScanning

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutProduceTicketInfoVO.java

@@ -120,5 +120,15 @@ public class OutProduceTicketInfoVO {
      */
     private String docYear;
 
+    /**
+     * 检测状态：0=未检测，1=检测中，2=已检测
+     */
+    private Short detectionStatus;
+
+    /**
+     * 检测结果：true=合格，false=不合格
+     */
+    private Boolean detectionResults;
+
     private List<OutProduceInfoItemVO> items;
 }

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutProduceVO.java

@@ -115,4 +115,14 @@ public class OutProduceVO {
      * 物料凭证年度
      */
     private String docYear;
+
+    /**
+     * 检测状态：0=未检测，1=检测中，2=已检测
+     */
+    private Short detectionStatus;
+
+    /**
+     * 检测结果：true=合格，false=不合格
+     */
+    private Boolean detectionResults;
 }

nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutProduce.java

@@ -136,4 +136,14 @@ public class WmsOutProduce implements Serializable {
      */
     @TableField("data_type")
     private Integer dataType;
+
+    /**
+     * 检测状态：0=未检测，1=检测中，2=已检测
+     */
+    private Short detectionStatus;
+
+    /**
+     * 检测结果：true=合格，false=不合格
+     */
+    private Boolean detectionResults;
 }