From 4337b43a085d85d85954e1eb55fbbfcf98990660 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Fri, 12 Apr 2024 09:52:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A0=A1=E9=AA=8C=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=B1=BB=E5=9E=8B=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inout/IoCodeTempController.java           |  6 +--
 .../inout/IoOrderDetailBizController.java     | 37 +++++++++++++++++++
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
index 0e39a46e..3216e696 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -395,10 +395,10 @@ public class IoCodeTempController extends BaseController {
             }
         }
 
-        //是否校验产品属性 ：1：校验；2.无需校验
+        //是否校验产品采购类型 ：1：校验；2.无需校验
         if (IntUtil.value(bussinessTypeEntity.getVailProductAttributes()) == 1) {
-            Integer purType = udiInfoEntity.getPurType(); //1：普通入账产品；2.预验收产品。3：寄售产品
-            int actionType = bussinessTypeEntity.getActionType(); //1：带票（正常）；2.预验收。3：寄售
+            Integer purType = IntUtil.value(udiInfoEntity.getPurType()); //1：普通入账产品；2.预验收产品。3：寄售产品
+            int actionType = IntUtil.value(bussinessTypeEntity.getActionType()); //1：带票（正常）；2.预验收。3：寄售
             if (purType != actionType) {
                 //包装友好提示
                 String msg = "";
diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
index 480a1118..ea0b50f7 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
@@ -130,6 +130,8 @@ public class IoOrderDetailBizController extends BaseController {
         if (addBizProductReqeust.getOrderEntity() == null)
             return ResultVOUtils.error(500, "未指定订单");
         IoOrderEntity orderEntity = addBizProductReqeust.getOrderEntity();
+
+
         IoOrderEntity isExit = orderService.findByBillNo(orderEntity.getBillNo());
         if (StrUtil.isEmpty(orderEntity.getBillNo()) || isExit == null) {
             BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
@@ -166,6 +168,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+",请检查后重试！");
+                }
+            }
+
             if (IntUtil.value(bussinessTypeEntity.getCheckCertExpire()) == 2 && udiRelevanceResponse.isNeedCert()) {
                 SupProductEntity supProductEntity = supProductService.findExitByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory(), authAdmin.getCustomerId());
                 if (supProductEntity != null && (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS)) {