7/11 sql

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

@@ -138,14 +138,13 @@ public class IoOrderController extends BaseController {
         //拿到当前单据
         List<IoOrderResponse> list = orderService.filterList(filterOrderRequest);
         //根据单据查询 发票号
-        for (IoOrderResponse ioOrderResponse : list) {
+        for (IoOrderResponse ioOrderResponse : list){
             FilterOrderDetailCodeRequest filterOrderDetailCodeRequest = new FilterOrderDetailCodeRequest();
             filterOrderDetailCodeRequest.setOrderIdFk(ioOrderResponse.getBillNo());
             List<IoOrderInvoiceEntity> orderInvoiceEntities = ioOrderInvoiceService.findByBillNo(filterOrderDetailCodeRequest.getOrderIdFk());
             String invoiceCodes = orderInvoiceEntities.stream()
                     .map(IoOrderInvoiceEntity::getInvoiceEncode)
                     .collect(Collectors.joining(","));
-            log.error("当前所有的发票号{}", invoiceCodes);
             ioOrderResponse.setInvoiceCodes(invoiceCodes);
         }
 

src/main/resources/mybatis/mapper/inout/IoOrderDao.xml

@@ -195,6 +195,7 @@
                             )
                 </if>
             </if>
+            GROUP BY io.billNo
         </where>
         <choose>
             <when test="(orderBy != null) and (sort == 'desc' or sort == 'asc')">

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);