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 23be1917b..94d3ba174 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -138,14 +138,13 @@ public class IoOrderController extends BaseController { //拿到当前单据 List list = orderService.filterList(filterOrderRequest); //根据单据查询 发票号 - for (IoOrderResponse ioOrderResponse : list) { + 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); } diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml index cf68d87a5..2319bd2c0 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml @@ -195,6 +195,7 @@ ) + GROUP BY io.billNo diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index e8c028808..8dd8090b2 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -3712,6 +3712,14 @@ CALL Pro_Temp_ColumnWork('device_check_item_dict', 'updateTime', 1); + +ALTER TABLE sup_evaluate MODIFY COLUMN `id` BIGINT NOT NULL; +ALTER TABLE sup_evaluate_detail MODIFY COLUMN `id` BIGINT NOT NULL; +ALTER TABLE sup_evaluate_plan MODIFY COLUMN `id` BIGINT NOT NULL; +ALTER TABLE sup_evaluate_plan_detail MODIFY COLUMN `id` BIGINT NOT NULL; +ALTER TABLE sup_evaluate_detail MODIFY COLUMN `planDetailId` BIGINT ; + + CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'codeCheck', 'tinyint NULL DEFAULT NULL COMMENT '' 是否开启校验扫码 :0:不校验;1:只允许录入扫码产品;2:只允许录入不扫码产品''', 1);