From 98cbe46cd17015e00a98616524cfad16cde95fe4 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Tue, 22 Oct 2024 15:37:50 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=98=AF=E5=90=A6=E9=9C=80=E8=A6=81?=
=?UTF-8?q?=E6=94=B6=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/basic/UdiRelevanceController.java | 1 +
.../controller/inout/IoCodeTempController.java | 16 ++++++++++++++++
.../inout/IoOrderDetailBizController.java | 8 ++++++++
.../entity/basic/BasicBussinessTypeEntity.java | 6 +++++-
.../glxp/api/entity/basic/UdiProductEntity.java | 1 +
.../api/req/basic/BussinessTypeSaveRequest.java | 2 ++
.../api/req/basic/UdiRelevanceSaveRequest.java | 1 +
.../res/basic/BasicBussinessTypeResponse.java | 2 ++
.../glxp/api/res/basic/UdiRelevanceResponse.java | 1 +
.../mybatis/mapper/basic/UdiProductDao.xml | 3 +++
.../mybatis/mapper/basic/UdiRelevanceDao.xml | 1 +
src/main/resources/schemas/schema_v2.4.sql | 9 +++++++++
12 files changed, 50 insertions(+), 1 deletion(-)
diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
index 0a9ed8f6..6c528ca1 100644
--- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
+++ b/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);
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 c023e9de..9e1310e5 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/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();
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 5ecee2a9..52b2454f 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
+++ b/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()) {
diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java
index 55790e03..6b267648 100644
--- a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java
+++ b/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;
}
diff --git a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
index 10ca3285..67e45394 100644
--- a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
+++ b/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;
}
diff --git a/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java b/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java
index 7bb4f4e0..d3f3dc06 100644
--- a/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java
+++ b/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;
+
}
diff --git a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java
index 566d52e6..17694388 100644
--- a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java
+++ b/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;
/**
* 包装规则
diff --git a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java
index 6c76e4b6..0e8d1b83 100644
--- a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java
+++ b/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;
+
}
diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
index 16356a23..1a44a5c2 100644
--- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
+++ b/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;
/**
* 包装规格
diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
index be6b152f..51346245 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
@@ -751,6 +751,9 @@
requireScanCode=#{requireScanCode},
+
+ requireCost=#{requireCost},
+
bzgg=#{bzgg},
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index d3f8f8ed..b0e4bb18 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/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
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index a36f065f..3df474d9 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/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);
\ No newline at end of file