feat: 产品增加采购类型校验

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -364,6 +364,40 @@ public class IoCodeTempController extends BaseController {
             }
         }
 
+        //是否校验产品采购类型 ：1：校验；2.无需校验
+        if (IntUtil.value(bussinessTypeEntity.getVailProductAttributes()) == 1) {
+            Integer purType = IntUtil.value(udiInfoEntity.getPurType()); //1：普通入账产品；2.预验收产品。3：寄售产品
+            int actionType = IntUtil.value(bussinessTypeEntity.getActionType()); //1：带票（正常）；2.预验收。3：寄售
+            if (purType != actionType) {
+                //包装友好提示
+                String msg = "";
+                switch (actionType) {
+                    case 1:
+                        msg = "普通入账产品";
+                        break;
+                    case 2:
+                        msg = "预验收产品";
+                        break;
+                    case 3:
+                        msg = "寄售产品";
+                        break;
+                }
+                String msg2 = "";
+                switch (purType) {
+                    case 1:
+                        msg2 = "普通入账产品";
+                        break;
+                    case 2:
+                        msg2 = "预验收产品";
+                        break;
+                    case 3:
+                        msg2 = "寄售产品";
+                        break;
+                }
+                return ResultVOUtils.error(500, "单据只允许录入" + msg + ",当前录入产品为" + msg2 + ",请检查后重试！");
+            }
+        }
+
         String orderId = addOrderRequest.getBillNo();
 
         //三期校验

src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java

@@ -183,6 +183,41 @@ public class IoOrderDetailBizController extends BaseController {
         }
         for (AddBizProductReqeust item : datas) {
             UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectSupGroupById(item.getRelId(), addBizProductReqeust.getSupId());
+            BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
+
+            //是否校验产品采购类型 ：1：校验；2.无需校验
+            if(IntUtil.value(bussinessTypeEntity.getVailProductAttributes()) == 1){
+                Integer purType = IntUtil.value(udiRelevanceResponse.getPurType()); //1：普通入账产品；2.预验收产品。3：寄售产品
+                int actionType = IntUtil.value(bussinessTypeEntity.getActionType()); //1：带票（正常）；2.预验收。3：寄售
+                if (purType != actionType){
+                    //包装友好提示
+                    String msg = "";
+                    switch (actionType) {
+                        case 1:
+                            msg = "普通入账产品";
+                            break;
+                        case 2:
+                            msg = "预验收产品";
+                            break;
+                        case 3:
+                            msg = "寄售产品";
+                            break;
+                    }
+                    String msg2 = "";
+                    switch (purType) {
+                        case 1:
+                            msg2 = "普通入账产品";
+                            break;
+                        case 2:
+                            msg2 = "预验收产品";
+                            break;
+                        case 3:
+                            msg2 = "寄售产品";
+                            break;
+                    }
+                    return ResultVOUtils.error(500, "单据只允许录入" + msg +",当前录入产品为"+msg2+",请检查后重试！");
+                }
+            }
 
 //            todo 查询产品是否已经通过认证
 //            BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());

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

@@ -487,6 +487,11 @@ public class BasicBussinessTypeEntity {
 
 
 
+    /**
+     * 校验产品属性 ：1：校验；2.无需校验
+     */
+    @TableField(value = "vailProductAttributes")
+    private Integer vailProductAttributes;
 
 
 

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

@@ -130,4 +130,6 @@ public class UdiProductEntity {
     @ApiModelProperty(value="耗材材质")
     private String matrial;
 
+    private Integer purType;
+
 }

src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java

@@ -320,4 +320,10 @@ public class BussinessTypeSaveRequest {
      * 是否允许库存批次号先进先出
      */
     private Boolean vailInvBatchNo;
+    /**
+     * 校验产品属性 ：1：校验；2.无需校验
+     */
+    @TableField(value = "vailProductAttributes")
+    private Integer vailProductAttributes;
+
 }

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

@@ -199,4 +199,10 @@ public class BasicBussinessTypeResponse {
      * 是否允许库存批次号先进先出
      */
     private Boolean vailInvBatchNo;
+    /**
+     * 校验产品属性 ：1：校验；2.无需校验
+     */
+    @TableField(value = "vailProductAttributes")
+    private Integer vailProductAttributes;
+
 }

src/main/resources/mybatis/mapper/basic/UdiProductDao.xml

@@ -167,9 +167,10 @@
 
     <select id="findByNameCode" parameterType="java.lang.String"
             resultType="com.glxp.api.entity.basic.UdiProductEntity">
-        SELECT *
+        SELECT basic_products.*,basic_udirel.purType
         FROM basic_products
-        WHERE (nameCode = #{nameCode})
+        LEFT JOIN basic_udirel ON basic_udirel.uuid = basic_products.uuid
+        WHERE (basic_products.nameCode = #{nameCode})
         limit 1
     </select>
     <insert id="insertUdiInfo" keyProperty="id" parameterType="com.glxp.api.entity.basic.UdiProductEntity">

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

@@ -2013,3 +2013,5 @@ CALL Pro_Temp_ColumnWork('basic_products', 'destinyType',
                          ' int(0)  NULL DEFAULT NULL COMMENT''1:定数包''',
                          1);
 
+
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailProductAttributes', 'tinyint    NULL DEFAULT NULL COMMENT ''校验产品采购类型 ：1：校验；2.无需校验''', 1);