bug修改

src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java

@@ -184,7 +184,6 @@ public class BasicBussinessTypeEntity {
     private String supplementOrderType;
 
 
-
     /**
      * 平衡补单是否二次验收
      */
@@ -280,6 +279,21 @@ public class BasicBussinessTypeEntity {
      */
     @TableField(value = "checkCopy")
     private int checkCopy;
+    /**
+     * 单据验收补单
+     */
+    @TableField(value = "checkReview")
+    private int checkReview;
+    /**
+     * 是否二次校验单据验收补单
+     */
+    @TableField(value = "secCheckReview")
+    private boolean seccheckReview;
+    /**
+     * 是否核对单据验收补单
+     */
+    @TableField(value = "thrCheckReview")
+    private boolean thrCheckReview;
 
     /**
      * 是否二次校验复制单据
@@ -414,4 +428,6 @@ public class BasicBussinessTypeEntity {
     //是否按货位出库    0：不按货位出库，1:按货位出库
     @TableField(value = "spaceOut")
     private int spaceOut;
+
+
 }

src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java

@@ -152,7 +152,17 @@ public class BasicBussinessTypeResponse {
     private String checkPreInOrders;
     private Boolean advancePreIn;
     private Integer sortNum;
-
-
     private int spaceOut;
+    /**
+     * 单据验收补单
+     */
+    private int checkReview;
+    /**
+     * 是否二次校验单据验收补单
+     */
+    private boolean seccheckReview;
+    /**
+     * 是否核对单据验收补单
+     */
+    private boolean thrCheckReview;
 }

src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java

@@ -126,6 +126,10 @@ public class IoCheckInoutService {
                 if (bussinessTypeEntity.getCheckCopy() == 0) {
                     return false;
                 }
+            } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_REVIEW) {
+                if (bussinessTypeEntity.getCheckReview() == 0) {
+                    return false;
+                }
             }
             return true;
         }
@@ -196,6 +200,11 @@ public class IoCheckInoutService {
                     unCheckFirstFinish(orderEntity);
                     return;
                 }
+            } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_REVIEW) {
+                if (bussinessTypeEntity.getCheckReview() == 0) {
+                    unCheckFirstFinish(orderEntity);
+                    return;
+                }
             }
             checkFirstFinish(orderEntity);
         }
@@ -218,6 +227,10 @@ public class IoCheckInoutService {
                 codeLostEntity.setId(IdUtil.getSnowflakeNextId());
                 codeLostEntity.setNameCode(udiEntity.getUdi());
                 codeLostEntity.setCode(codeEntity.getCode());
+                codeLostEntity.setBatchNo(codeEntity.getBatchNo());
+                codeLostEntity.setProduceDate(codeEntity.getProduceDate());
+                codeLostEntity.setExpireDate(codeEntity.getExpireDate());
+                codeLostEntity.setSerialNo(codeEntity.getSerialNo());
             }
             //校验是否写入缺失表
             boolean isTrue = false;
@@ -773,6 +786,10 @@ public class IoCheckInoutService {
                     if (!bussinessTypeEntity.isThrCheckSp()) {
                         orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_REW);
                     }
+                } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_REVIEW) {
+                    if (!bussinessTypeEntity.isThrCheckReview()) {
+                        orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_REW);
+                    }
                 }
             } else {
                 orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_REW);
@@ -833,6 +850,10 @@ public class IoCheckInoutService {
                     if (!bussinessTypeEntity.isSecCheckSp()) {
                         orderEntity.setStatus(ConstantStatus.ORDER_STATUS_AUDITED);
                     }
+                } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_REVIEW) {
+                    if (!bussinessTypeEntity.isSeccheckReview()) {
+                        orderEntity.setStatus(ConstantStatus.ORDER_STATUS_AUDITED);
+                    }
                 }
             } else {
                 orderEntity.setStatus(ConstantStatus.ORDER_STATUS_AUDITED);

src/main/resources/schemas/schema_v2.1.sql

@@ -441,3 +441,7 @@ CALL Pro_Temp_ColumnWork('io_order', 'outSickInfo', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('inv_inner_order_detail', 'nameCode', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('inv_inner_order_detail', 'nameCode',
                          'varchar(255) ', 1);
+
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkReview', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'secCheckReview', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckReview', 'tinyint', 1);