From 52ff3ecd4a41668b08277ace6d0fa5fce8082f4c Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Thu, 6 Jun 2024 14:24:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=200606=E6=B3=A8=E9=87=8A=E6=8E=89?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E9=9C=80=E8=A6=81=E6=89=AB=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoCodeTempController.java | 12 ++++++-- .../inout/IoOrderDetailBizController.java | 30 ++++++++++++------- .../basic/BasicBussinessTypeEntity.java | 6 ++++ .../impl/IoOrderDetailBizServiceImpl.java | 14 +++++++-- src/main/resources/schemas/schema_v2.4.sql | 4 +++ 5 files changed, 52 insertions(+), 14 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 1d8e06220..e69782ae6 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -4,6 +4,7 @@ import com.glxp.api.annotation.CusRedissonAnnotation; import com.glxp.api.constant.*; import com.glxp.api.entity.basic.*; import com.glxp.api.entity.inv.InvProductDetailEntity; +import com.glxp.api.exception.JsonException; import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inv.impl.InvProductDetailService; import org.springframework.beans.BeanUtils; @@ -398,7 +399,15 @@ public class IoCodeTempController extends BaseController { } } - if (udiInfoEntity.getRequireScanCode() == 1){ +// if (bussinessTypeEntity.getRequireScanCode() == 1) { +// if (udiInfoEntity.getRequireScanCode() != 1){ +// return ResultVOUtils.error(500, "单据只允许录入需要扫码耗材" + ",请检查后重试！"); +// } +// }else if (bussinessTypeEntity.getRequireScanCode() == 0){ +// if (udiInfoEntity.getRequireScanCode() != 0){ +// return ResultVOUtils.error(500, "单据只允许录入不需要扫码耗材" + ",请检查后重试！"); +// } +// } //是否校验耗材材质 1：高值耗材；2.普通耗材 if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) { if (IntUtil.value(udiInfoEntity.getHcType()) != 1) { @@ -409,7 +418,6 @@ public class IoCodeTempController extends BaseController { 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 7cf18ec3f..08277c3c6 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -219,16 +219,26 @@ public class IoOrderDetailBizController extends BaseController { } } - if (udiRelevanceResponse.getRequireScanCode() == 1) { - //是否校验耗材材质 1：高值耗材；2.普通耗材 - if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) { - if (IntUtil.value(udiRelevanceResponse.getHcType()) != 1) { - return ResultVOUtils.error(500, "单据只允许录入高值耗材" + ",请检查后重试！"); - } - } else if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 2)) { - if (IntUtil.value(udiRelevanceResponse.getHcType()) != 2) { - return ResultVOUtils.error(500, "单据只允许录入普通耗材" + ",请检查后重试！"); - } +// if (bussinessTypeEntity.getCheckVailDate() != 4) { +// if (bussinessTypeEntity.getRequireScanCode() == 1) { +// if (udiRelevanceResponse.getRequireScanCode() != 1){ +// return ResultVOUtils.error(500, "单据只允许录入需要扫码耗材" + ",请检查后重试！"); +// } +// }else if (bussinessTypeEntity.getRequireScanCode() == 0){ +// if (udiRelevanceResponse.getRequireScanCode() != 0){ +// return ResultVOUtils.error(500, "单据只允许录入不需要扫码耗材" + ",请检查后重试！"); +// } +// } +// } + + //是否校验耗材材质 1：高值耗材；2.普通耗材 + if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) { + if (IntUtil.value(udiRelevanceResponse.getHcType()) != 1) { + return ResultVOUtils.error(500, "单据只允许录入高值耗材" + ",请检查后重试！"); + } + } else if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 2)) { + if (IntUtil.value(udiRelevanceResponse.getHcType()) != 2) { + return ResultVOUtils.error(500, "单据只允许录入普通耗材" + ",请检查后重试！"); } } 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 9523657f0..70d70b0c0 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java @@ -505,4 +505,10 @@ public class BasicBussinessTypeEntity { @TableField(value = "devInType") private Integer devInType; + /** + * 是否需要扫码 ：0：不需要；1.需要 + */ + @TableField(value = "requireScanCode") + private Integer requireScanCode; + } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java index f37f4e867..91ca2958e 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java @@ -290,7 +290,18 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { } } - if (udiRelevanceResponse.getRequireScanCode() == 1){ +// if (bussinessTypeEntity.getCheckVailDate() != 4) { +// if (bussinessTypeEntity.getRequireScanCode() == 1) { +// if (udiRelevanceResponse.getRequireScanCode() != 1){ +// throw new JsonException("单据只允许录入需要扫码耗材" + ",请检查后重试！"); +// } +// }else if (bussinessTypeEntity.getRequireScanCode() == 0){ +// if (udiRelevanceResponse.getRequireScanCode() != 0){ +// throw new JsonException("单据只允许录入不需要扫码耗材" + ",请检查后重试！"); +// } +// } +// } + //是否校验耗材材质 1：高值耗材；2.普通耗材 if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) { if (IntUtil.value(udiRelevanceResponse.getHcType()) != 1) { @@ -301,7 +312,6 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { throw new JsonException("单据只允许录入普通耗材\" + \",请检查后重试！"); } } - } if (udiRelevanceResponse.getPurType() == 2) { diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 02b81f79d..0c7cde721 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -3691,3 +3691,7 @@ CALL Pro_Temp_ColumnWork('basic_products', 'requireScanCode', 1); INSERT IGNORE INTO `sys_custom_config_detail` (`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (41779, 94, '2', 1, 'confirmDateRange', '发票确认时间', 'datePickera', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'requireScanCode', + 'bit(1) NOT NULL DEFAULT b''0'' COMMENT ''是否需要扫码 1是；0否''', + 1); From d2a7f661a0b69b7ec9eb2195b573d5eaff1ca2cb Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 7 Jun 2024 15:17:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?6/7=20=E5=8D=95=E6=8D=AE=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/req/basic/BasicUnitMaintainFilterRequest.java | 2 ++ .../glxp/api/req/inout/FilterOrderDetailResultRequest.java | 1 + .../java/com/glxp/api/req/inout/FilterOrderRequest.java | 2 +- .../com/glxp/api/res/inout/IoOrderDetailResultResponse.java | 2 ++ src/main/resources/mybatis/mapper/inout/IoOrderDao.xml | 4 ++++ .../mybatis/mapper/inout/IoOrderDetailResultDao.xml | 5 ++++- src/main/resources/schemas/schema_v2.4.sql | 6 ++++++ 7 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java b/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java index d9b3db6e0..70f736495 100644 --- a/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java @@ -16,6 +16,8 @@ public class BasicUnitMaintainFilterRequest extends ListPageRequest { private String thirdSys; private String thirdSysFk; + private String customerId; + private String thirdId; private String thirdId1; private String thirdId2; diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java index eb2c06bf8..ee46b3c3f 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java @@ -60,4 +60,5 @@ public class FilterOrderDetailResultRequest extends ListPageRequest { private String locInvName; private String confirmStarTime; //发票确认起始日期 private String confirmEndTime; //发票确认结束日期 + private String corpName;//供应商名字 } diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java index 3966a88e5..a4c7659ca 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java @@ -193,7 +193,7 @@ public class FilterOrderRequest extends ListPageRequest { private String orderBy; private String uploadKey; - private String invoiceEncode; + private String invoiceEncode;//发票号 //联合备注字段查询 private String unionRemark; diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java index 183fb4329..63fc2d379 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java @@ -214,6 +214,8 @@ public class IoOrderDetailResultResponse { @ExcelProperty(value = "发票确认时间", index = 12) private Date confirmTime; + private String corpName; + public String getFromName() { if (StrUtil.isNotEmpty(fromCorpName)) diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml index 5a3627059..0dae4e934 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml @@ -17,6 +17,7 @@ from io_order as io left join auth_warehouse aw on aw.code = io.fromInvCode left join basic_corp bc on bc.erpId = io.fromCorp + left join io_order_invoice ioi on ioi.orderIdFk = io.billNo INNER JOIN io_unit_maintain_platform a2 on io.action = a2.sourceAction AND io.fromCorp = a2.unitId @@ -51,6 +52,9 @@ AND io.fromCorp = #{fromCorp} + + AND ioi.invoiceEncode = #{invoiceEncode} + AND ( bc.name like concat('%', #{keyWord}, '%') diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml index 869e70f04..f4533d696 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml @@ -28,7 +28,7 @@ a1.mainAction, a1.confirmTime as confirmTime, a1.auditTime, - b1.NAME AS fromCorpName, + b1.NAME AS corpName, (select name from auth_warehouse aw where aw.code = a1.fromInvCode) as fromInvName, (SELECT NAME FROM basic_bussiness_type bus WHERE bus.action = a1.action) billTypeName FROM io_order_detail_result a2 @@ -75,6 +75,9 @@ AND a2.certCode like concat('%', #{zczbhhzbapzbh}, '%') + + AND b1.name like concat('%', #{corpName}, '%') + AND date_format(a1.auditTime, '%Y-%m-%d') between date_format(#{startAduditTime}, '%Y-%m-%d') and date_format(#{endAduditTime}, '%Y-%m-%d') diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 0c7cde721..4eb5a20be 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -3695,3 +3695,9 @@ INSERT IGNORE INTO `sys_custom_config_detail` (`id`, `configId`, `type`, `isShow CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'requireScanCode', 'bit(1) NOT NULL DEFAULT b''0'' COMMENT ''是否需要扫码 1是；0否''', 1); + + +INSERT IGNORE INTO `sys_custom_config_detail` (`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (41782, 68, '2', 1, 'invoiceEncode', '发票号', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + +INSERT IGNORE INTO `sys_custom_config_detail` (`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (41780, 94, '2', 1, 'corpName', '供应商', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT IGNORE INTO `sys_custom_config_detail` (`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (41781, 94, '1', 1, 'corpName', '供应商', 'text', NULL, NULL, NULL, 160, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); From b630f392f5a3c990d1849968c310ded82f073a97 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 11 Jun 2024 15:28:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?6/11=20=E5=8D=95=E6=8D=AE=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/inout/IoOrderController.java | 16 ++++++++++++++++ .../inout/IoOrderDetailResultController.java | 3 +++ .../res/inout/IoOrderDetailResultResponse.java | 1 + .../com/glxp/api/res/inout/IoOrderResponse.java | 2 ++ .../mybatis/mapper/inout/IoOrderDao.xml | 2 +- 5 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index 54e52f217..2f9075fef 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -97,6 +97,9 @@ public class IoOrderController extends BaseController { @Resource InvProductDetailService invProductDetailService; + @Resource + IoOrderInvoiceService ioOrderInvoiceService; + /** * 查询单据列表 * @@ -132,7 +135,20 @@ public class IoOrderController extends BaseController { if (!customerId.equals("110")) { filterOrderRequest.setFromCorp(customerId); } + //拿到当前单据 List list = orderService.filterList(filterOrderRequest); + //根据单据查询 发票号 + for (IoOrderResponse ioOrderResponse : list){ + FilterOrderDetailCodeRequest filterOrderDetailCodeRequest = new FilterOrderDetailCodeRequest(); + filterOrderDetailCodeRequest.setOrderIdFk(ioOrderResponse.getBillNo()); + List orderInvoiceEntities = ioOrderInvoiceService.findByBillNo(filterOrderDetailCodeRequest.getOrderIdFk()); + String invoiceCodes = orderInvoiceEntities.stream() + .map(IoOrderInvoiceEntity::getInvoiceEncode) + .collect(Collectors.joining(",")); + log.error("当前所有的发票号{}",invoiceCodes); + ioOrderResponse.setInvoiceCodes(invoiceCodes); + } + PageInfo pageInfo = new PageInfo<>(list); return ResultVOUtils.page(pageInfo); } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java index d2070e52a..2b5a3e31b 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java @@ -41,6 +41,7 @@ import com.glxp.api.util.BeanCopyUtils; import com.glxp.api.util.JasperUtils; import com.glxp.api.util.MsDateUtil; import com.glxp.api.vo.dev.DeviceInfoVo; +import lombok.extern.slf4j.Slf4j; import net.sf.jasperreports.engine.JRException; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Value; @@ -64,6 +65,7 @@ import java.util.*; * 单据扫码明细查询接口 */ @RestController +@Slf4j public class IoOrderDetailResultController extends BaseController { @Resource IoOrderService orderService; @@ -345,6 +347,7 @@ public class IoOrderDetailResultController extends BaseController { ioOrderDetailResultData.put("productDate", ioOrderDetailResultResponse.getProductDate() == null ? ' ' : ioOrderDetailResultResponse.getProductDate()); ioOrderDetailResultData.put("expireDate", ioOrderDetailResultResponse.getExpireDate() == null ? ' ' : ioOrderDetailResultResponse.getExpireDate()); ioOrderDetailResultData.put("coName", ioOrderDetailResultResponse.getCoName() == null ? ' ' : ioOrderDetailResultResponse.getCoName()); + ioOrderDetailResultData.put("corpName", ioOrderDetailResultResponse.getCorpName()== null ? ' ' : ioOrderDetailResultResponse.getCorpName()); ioOrderDetailResultData.put("certCode", ioOrderDetailResultResponse.getCertCode() == null ? ' ' : ioOrderDetailResultResponse.getCertCode()); ioOrderDetailResultData.put("ylqxzcrbarmc", ioOrderDetailResultResponse.getYlqxzcrbarmc() == null ? ' ' : ioOrderDetailResultResponse.getYlqxzcrbarmc()); ioOrderDetailResultData.put("manufacturer", ioOrderDetailResultResponse.getManufacturer() == null ? ' ' : ioOrderDetailResultResponse.getManufacturer()); diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java index 63fc2d379..7a3a3f53e 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java @@ -214,6 +214,7 @@ public class IoOrderDetailResultResponse { @ExcelProperty(value = "发票确认时间", index = 12) private Date confirmTime; + @ExcelProperty(value = "配送商", index = 7) private String corpName; diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java index 9f7d9a2d8..560612762 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java @@ -264,6 +264,8 @@ public class IoOrderResponse { private String checkPreInOrders; + private String invoiceCodes;//单据所有发票号 + public String getFromName() { diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml index 0dae4e934..cf68d87a5 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml @@ -53,7 +53,7 @@ AND io.fromCorp = #{fromCorp} - AND ioi.invoiceEncode = #{invoiceEncode} + AND ioi.invoiceEncode like concat('%', #{invoiceEncode}, '%') AND (