新增审核后更改产品为可配送

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

@@ -572,13 +572,26 @@ public class IoCodeTempController extends BaseController {
             }
             //产品是否可以以使用单元入库
             udiRelevanceResponses = udiRelevanceService.selectGroupByNameCode(codeEnttity.getNameCode(), false);
-            if (udiRelevanceResponses.size() == 1) {
+            if (udiRelevanceResponses.size() >= 1) {
                 UdiRelevanceResponse udiRelevanceResponse = udiRelevanceResponses.get(0);
                 if (udiRelevanceResponse == null) {
                     return ResultVOUtils.error(500, "该产品信息未维护！");
                 } else if (!udiRelevanceResponse.getUseDy() && udiRelevanceResponse.getDiType() == ConstantStatus.DITYPE_SYDY) {
                     return ResultVOUtils.error(500, "该产品不允许以使用单元入库！");
                 }
+
+                if (bussinessTypeEntity.isVailDispatch() && !udiRelevanceResponse.isDispatch()) {
+                    return ResultVOUtils.error(500, "该产品不可配送，请联系院方！");
+                }
+
+                if (bussinessTypeEntity.getVailGroupBuy() == 1 && !udiRelevanceResponse.isGroupBuy()) {       //只采集集采产品
+                    return ResultVOUtils.error(500, bussinessTypeEntity.getName() + "单只允许录入集采产品！");
+                }
+
+                if (bussinessTypeEntity.getVailGroupBuy() == 2 && udiRelevanceResponse.isGroupBuy()) {        //只采集非集采产品
+                    return ResultVOUtils.error(500, bussinessTypeEntity.getName() + "单只允许录入非集采产品！");
+                }
+                
                 //计算实际数量
                 codeEnttity.setReCount(codeEnttity.getMyCount() * udiCalCountUtil.getActCount(udiRelevanceResponse));
             } else if (udiRelevanceResponses.size() == 0) {

src/main/java/com/glxp/api/controller/purchase/SupProductController.java

@@ -10,6 +10,7 @@ import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.entity.basic.UdiRelevanceEntity;
 import com.glxp.api.entity.purchase.SupCertEntity;
 import com.glxp.api.entity.purchase.SupCertSetEntity;
 import com.glxp.api.entity.purchase.SupManufacturerEntity;
@@ -334,6 +335,14 @@ public class SupProductController {
 
         supProductEntity.setUpdateTime(new Date());
         boolean b = supProductService.modifyRegistration(supProductEntity);
+        if (StrUtil.isNotEmpty(supProductEntity.getRelIdFk())) {
+            UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(Long.parseLong(supProductEntity.getRelIdFk()));
+            if (udiRelevanceEntity != null) {
+                udiRelevanceEntity.setDispatch(true);
+                udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
+            }
+
+        }
 
 //        if (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS) {
 //            SupProductResponse supProductResponse = supProductService.findJoinRegistration(supProductEntity.getId());

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

@@ -157,5 +157,10 @@ public class UdiRelevanceEntity {
 
     @TableField(value = "remark")
     private String remark;
-
+    @TableField(value = "useExpireTime")
+    private Integer useExpireTime;
+    @TableField(value = "dispatch")
+    private boolean dispatch;
+    @TableField(value = "groupBuy")        //是否可配送
+    private boolean groupBuy;           //是否集采产品
 }