feat: 是否需要收费

src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java

@@ -370,6 +370,7 @@ public class UdiRelevanceController extends BaseController {
         udiProductEntity.setCatalogname3(udiRelevanceSaveRequest.getCatalogname3());
         udiProductEntity.setMatrial(udiRelevanceSaveRequest.getMatrial());
         udiProductEntity.setRequireScanCode(udiRelevanceSaveRequest.getRequireScanCode());
+        udiProductEntity.setRequireCost(udiRelevanceSaveRequest.getRequireCost());
         udiProductEntity.setFlbm(udiRelevanceSaveRequest.getFlbm());
         udiProductEntity.setBzgg(udiRelevanceSaveRequest.getBzgg());
 //        udiProductEntity = UdiInfoUtil.initUdiInfoEntity(udiProductEntity);

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

@@ -14,6 +14,7 @@ import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.*;
 import com.glxp.api.constant.Constant;
 import com.glxp.api.controller.BaseController;
+import com.glxp.api.dao.basic.UdiRelevanceDao;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.auth.InvWarehouseEntity;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
@@ -27,7 +28,9 @@ import com.glxp.api.entity.inv.InvPreinDetailEntity;
 import com.glxp.api.entity.purchase.SupCertEntity;
 import com.glxp.api.entity.purchase.SupProductEntity;
 import com.glxp.api.entity.system.SystemParamConfigEntity;
+import com.glxp.api.exception.JsonException;
 import com.glxp.api.req.basic.CompanyProductRelevanceRequest;
+import com.glxp.api.req.basic.FilterUdiRelRequest;
 import com.glxp.api.req.inout.AddEnterCodeRequest;
 import com.glxp.api.req.inout.AddOrderRequest;
 import com.glxp.api.req.inout.FilterCodeRequest;
@@ -101,6 +104,8 @@ public class IoCodeTempController extends BaseController {
     IoCodeService codeService;
     @Resource
     InvPreProductDetailService invPreProductDetailService;
+    @Resource
+    UdiRelevanceDao udiRelevanceDao;
 
     //手持端扫码单据上传调用接口
     @AuthRuleAnnotation("")
@@ -451,6 +456,17 @@ public class IoCodeTempController extends BaseController {
                     return ResultVOUtils.error(500, "单据只允许录入不需要扫码产品" + ",请检查后重试！");
                 }
             }
+
+            //是否需要收费校验 是否已绑定收费项目
+            if (IntUtil.value(bussinessTypeEntity.getRequireCost()) == 1 ){
+                FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
+                filterUdiRelRequest.setUuid(udiInfoEntity.getUuid());
+                UdiRelevanceResponse udiRelevanceResponse = udiRelevanceDao.selectOneUdiJoinSup(filterUdiRelRequest);
+                if(IntUtil.value(udiRelevanceResponse.getRequireCost()) == 1) {
+                    String thirdId = udiRelevanceResponse.getThirdId();
+                    if (StrUtil.isEmpty(thirdId)) return ResultVOUtils.error(500, "当前产品未绑定收费项目" + ",请检查后重试！");
+                }
+            }
         }
 
         String orderId = addOrderRequest.getBillNo();

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

@@ -29,6 +29,7 @@ import com.glxp.api.entity.system.SystemParamConfigEntity;
 import com.glxp.api.entity.thrsys.ThrOrderDetailEntity;
 import com.glxp.api.entity.thrsys.ThrOrderEntity;
 import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity;
+import com.glxp.api.exception.JsonException;
 import com.glxp.api.req.inout.*;
 import com.glxp.api.req.inv.FilterInvoiceRequest;
 import com.glxp.api.req.system.DeleteRequest;
@@ -223,6 +224,13 @@ public class IoOrderDetailBizController extends BaseController {
                         return ResultVOUtils.error(500, "单据只允许录入不需要扫码产品" + ",请检查后重试！");
                     }
                 }
+
+                //是否需要收费校验 是否已绑定收费项目
+                if (IntUtil.value(bussinessTypeEntity.getRequireCost()) == 1 && IntUtil.value(udiRelevanceResponse.getRequireCost()) == 1) {
+                    String thirdId = udiRelevanceResponse.getThirdId();
+                    if (StrUtil.isEmpty(thirdId))  return ResultVOUtils.error(500, "当前产品未绑定收费项目" + ",请检查后重试！");
+                }
+
             }
 
             if (IntUtil.value(bussinessTypeEntity.getCheckCertExpire()) == 2 && udiRelevanceResponse.isNeedCert()) {

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

@@ -466,5 +466,9 @@ public class BasicBussinessTypeEntity {
      */
     @TableField(value = "codeCheck")
     private Integer codeCheck;
-
+    /**
+     * 校验是否需要收费 ：0：不需要；1.需要
+     */
+    @TableField(value = "requireCost")
+    private Integer requireCost;
 }

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

@@ -167,5 +167,6 @@ public class UdiProductEntity {
      */
     private String bzgg;
 
+    private Integer requireCost;
     private Boolean isStack;
 }

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

@@ -322,4 +322,6 @@ public class BussinessTypeSaveRequest {
     @TableField(value = "codeCheck")
     private Integer codeCheck;
 
+    private Integer requireCost;
+
 }

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

@@ -145,6 +145,7 @@ public class UdiRelevanceSaveRequest {
     private String catalogcode;
 
     private Integer requireScanCode;
+    private Integer requireCost;
 
     /**
      * 包装规则

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

@@ -191,4 +191,6 @@ public class BasicBussinessTypeResponse {
     @TableField(value = "codeCheck")
     private Integer codeCheck;
 
+    private Integer requireCost;
+
 }

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

@@ -177,6 +177,7 @@ public class UdiRelevanceResponse {
     private String matrial;
 
     private Integer requireScanCode;
+    private Integer requireCost;
 
     /**
      * 包装规格

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

@@ -751,6 +751,9 @@
             <if test="requireScanCode != null">
                 requireScanCode=#{requireScanCode},
             </if>
+            <if test="requireCost != null">
+                requireCost=#{requireCost},
+            </if>
             <if test="bzgg != null">
                 bzgg=#{bzgg},
             </if>

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

@@ -472,6 +472,7 @@
                basic_products.catalogname3,
                basic_products.matrial,
                basic_products.requireScanCode,
+               basic_products.requireCost,
                basic_products.bzgg
 
         FROM basic_products

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

@@ -853,4 +853,13 @@ CALL Pro_Temp_ColumnWork('basic_udirel', 'isStack', 'tinyint', 1);
 
 CALL Pro_Temp_ColumnWork('auth_user', 'oldPassWord',
                          'longtext DEFAULT NULL COMMENT ''最近5次旧密码''',
+                         1);
+
+
+CALL Pro_Temp_ColumnWork('basic_products', 'requireCost',
+                         'bit(1) NOT NULL DEFAULT b''0'' COMMENT ''是否需要收费 1是；0否''',
+                         1);
+
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'requireCost',
+                         'bit(1) NOT NULL DEFAULT b''0'' COMMENT ''校验是否需要收费 1是；0否''',
                          1);