Merge remote-tracking branch 'origin/dev' into dev

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

@@ -37,6 +37,7 @@ import com.glxp.api.res.basic.UdiRelevanceResponse;
 import com.glxp.api.res.basic.UdiRlSupResponse;
 import com.glxp.api.res.inout.IoOrderDetailBizResponse;
 import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
+import com.glxp.api.res.inout.IoOrderDetailResultResponse;
 import com.glxp.api.res.inout.IoOrderInvoiceResponse;
 import com.glxp.api.service.auth.InvWarehouseService;
 import com.glxp.api.service.basic.*;
@@ -701,9 +702,9 @@ public class IoOrderDetailBizController extends BaseController {
      */
     @GetMapping("/udiwms/inout/bizDetail/filterBizOrderList")
     public BaseResponse filterBizOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest) {
-        List<IoOrderDetailCodeResponse> ioOrderDetailCodeResponses = orderDetailBizService.getfilterOrderList(orderDetailBizRequest);
+        List<IoOrderDetailResultResponse> ioOrderDetailCodeResponses = orderDetailBizService.getInvoicResultDetail(orderDetailBizRequest);
         List<IoOrderInvoiceEntity> orderInvoiceEntities = ioOrderInvoiceService.findByBillNo(orderDetailBizRequest.getOrderIdFk());
-        for (IoOrderDetailCodeResponse orderDetailCodeEntity : ioOrderDetailCodeResponses) {
+        for (IoOrderDetailResultResponse orderDetailCodeEntity : ioOrderDetailCodeResponses) {
             if (orderDetailCodeEntity.getReCount() != 0 && orderDetailCodeEntity.getPrice() != null) {
                 orderDetailCodeEntity.setAmount(new BigDecimal(orderDetailCodeEntity.getReCount()).multiply(orderDetailCodeEntity.getPrice()));
             }
@@ -722,7 +723,7 @@ public class IoOrderDetailBizController extends BaseController {
             }
             orderDetailCodeEntity.setInvoiceCodes(msg);
         }
-        PageInfo<IoOrderDetailCodeResponse> pageInfo = new PageInfo<>(ioOrderDetailCodeResponses);
+        PageInfo<IoOrderDetailResultResponse> pageInfo = new PageInfo<>(ioOrderDetailCodeResponses);
         return ResultVOUtils.page(pageInfo);
     }
 

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

@@ -21,10 +21,7 @@ import com.glxp.api.req.inout.FilterOrderDetailCodeRequest;
 import com.glxp.api.req.inout.IoOrderInvoiceRequest;
 import com.glxp.api.req.inout.RefreshInoiceRequest;
 import com.glxp.api.req.system.DeleteRequest;
-import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
+import com.glxp.api.res.inout.*;
-import com.glxp.api.res.inout.IoOrderInvoiceResponse;
-import com.glxp.api.res.inout.IoOrderResponse;
-import com.glxp.api.res.inout.RefreshInoiceResponse;
 import com.glxp.api.service.auth.CustomerService;
 import com.glxp.api.service.inout.IoOrderDetailBizService;
 import com.glxp.api.service.inout.IoOrderDetailCodeService;
@@ -95,8 +92,6 @@ public class IoOrderInvoiceController {
     }
 
 
-
-
     //分组查询发票列表
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/inout/order/group/invoice")
@@ -162,8 +157,8 @@ public class IoOrderInvoiceController {
             //查询单据详情
             FilterOrderDetailCodeRequest orderDetailBizRequest = new FilterOrderDetailCodeRequest();
             orderDetailBizRequest.setOrderIdFk(orderFk);
-            List<IoOrderDetailCodeResponse> ioOrderDetailCodeResponses = orderDetailBizService.getfilterOrderList(orderDetailBizRequest);
+            List<IoOrderDetailResultResponse> ioOrderDetailCodeResponses = orderDetailBizService.getInvoicResultDetail(orderDetailBizRequest);
-            for (IoOrderDetailCodeResponse ioOrderDetailCodeRespons : ioOrderDetailCodeResponses) {
+            for (IoOrderDetailResultResponse ioOrderDetailCodeRespons : ioOrderDetailCodeResponses) {
                 IoOrderInvoiceEntity ioOrderInvoiceEntity = new IoOrderInvoiceEntity();
                 BeanUtils.copyProperties(ioOrderInvoiceRequest, ioOrderInvoiceEntity);
                 ioOrderInvoiceEntity.setId(IdUtil.getSnowflakeNextId());

src/main/java/com/glxp/api/controller/inv/UdiTraceController.java

@@ -27,10 +27,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 @RestController
@@ -175,10 +172,7 @@ public class UdiTraceController {
                                     mInvProductDetailEntities.addAll(invProductDetailEntities);
                                 }
                             }
-
                         }
-
-
                     } else {
                         filterInvProductDetailRequest = new FilterInvProductDetailRequest();
                         filterInvProductDetailRequest.setRelId(udiRelevanceResponse.getId() + "");
@@ -187,14 +181,9 @@ public class UdiTraceController {
                         if (CollUtil.isNotEmpty(invProductDetailEntities)) {
                             mInvProductDetailEntities.addAll(invProductDetailEntities);
                         }
-
                     }
                 }
-
-
             }
-
-
         } else {
             //单级包装
             FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
@@ -205,8 +194,6 @@ public class UdiTraceController {
                 mInvProductDetailEntities.addAll(invProductDetailEntities);
             }
         }
-
-
         if (mInvProductDetailEntities.size() > 0) {
             Map<String, String> filterMap = new HashMap<>();
 
@@ -222,6 +209,7 @@ public class UdiTraceController {
             filterOrderRequest.setPage(filterCodeTraceRequest.getPage());
             filterOrderRequest.setLimit(filterCodeTraceRequest.getLimit());
             List<IoOrderResponse> orderEntities = orderService.filterList(filterOrderRequest);
+            Collections.sort(orderEntities, Comparator.comparing(IoOrderResponse::getCreateTime));
             PageInfo<IoOrderResponse> pageInfo;
             pageInfo = new PageInfo<>(orderEntities);
             PageSimpleResponse<IoOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();

src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java

@@ -2,10 +2,12 @@ package com.glxp.api.dao.inout;
 
 import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
+import com.glxp.api.entity.inout.IoOrderDetailResultEntity;
 import com.glxp.api.req.inout.FilterOrderDetailBizRequest;
 import com.glxp.api.req.inout.FilterOrderDetailCodeRequest;
 import com.glxp.api.res.inout.IoOrderDetailBizResponse;
 import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
+import com.glxp.api.res.inout.IoOrderDetailResultResponse;
 import com.glxp.api.res.inout.IoOrderInvoiceResponse;
 import org.apache.ibatis.annotations.Param;
 
@@ -24,7 +26,7 @@ public interface IoOrderDetailBizDao extends BaseMapperPlus<IoOrderDetailBizDao,
     List<IoOrderDetailCodeResponse> getfilterList(FilterOrderDetailCodeRequest orderDetailBizRequest);
 
 
-    List<IoOrderDetailCodeResponse> getfilterOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest);
+    List<IoOrderDetailResultResponse> getfilterOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest);
 
     List<IoOrderInvoiceResponse> filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest);
 

src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java

@@ -165,6 +165,20 @@ public class IoOrderDetailResultResponse {
     private String fromInvName;
     private String fromName;
 
+
+
+    private int orderCount;
+
+    private String invoiceCodes;
+
+    private Integer sucCount;
+
+    private boolean regStatus;
+
+    //金额
+    private BigDecimal amount;
+
+
     public String getFromName() {
         if (StrUtil.isNotEmpty(fromCorpName))
             return fromCorpName;

src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java

@@ -1,10 +1,12 @@
 package com.glxp.api.service.inout;
 
 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
+import com.glxp.api.entity.inout.IoOrderDetailResultEntity;
 import com.glxp.api.req.inout.FilterOrderDetailBizRequest;
 import com.glxp.api.req.inout.FilterOrderDetailCodeRequest;
 import com.glxp.api.res.inout.IoOrderDetailBizResponse;
 import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
+import com.glxp.api.res.inout.IoOrderDetailResultResponse;
 import com.glxp.api.res.inout.IoOrderInvoiceResponse;
 
 import java.util.List;
@@ -52,7 +54,7 @@ public interface IoOrderDetailBizService {
 
     Boolean updateOrderDetailBiz(IoOrderDetailBizEntity ioOrderDetailBizEntity);
 
-    List<IoOrderDetailCodeResponse> getfilterOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest);
+    List<IoOrderDetailResultResponse> getInvoicResultDetail(FilterOrderDetailCodeRequest orderDetailBizRequest);
 
 
 }

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java

@@ -9,11 +9,13 @@ import com.glxp.api.dao.inout.IoOrderDetailBizDao;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
 import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
+import com.glxp.api.entity.inout.IoOrderDetailResultEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
 import com.glxp.api.req.inout.FilterOrderDetailBizRequest;
 import com.glxp.api.req.inout.FilterOrderDetailCodeRequest;
 import com.glxp.api.res.inout.IoOrderDetailBizResponse;
 import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
+import com.glxp.api.res.inout.IoOrderDetailResultResponse;
 import com.glxp.api.res.inout.IoOrderInvoiceResponse;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import com.glxp.api.service.inout.IoCheckInoutService;
@@ -132,7 +134,7 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
     }
 
     @Override
-    public List<IoOrderDetailCodeResponse> getfilterOrderList(FilterOrderDetailCodeRequest OrderDetailCodeRequest) {
+    public List<IoOrderDetailResultResponse> getInvoicResultDetail(FilterOrderDetailCodeRequest OrderDetailCodeRequest) {
         if (null == OrderDetailCodeRequest) {
             return Collections.emptyList();
         }

src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java

@@ -214,7 +214,7 @@ public class InvPreInProductDetailServiceImpl implements InvPreinProductDetailSe
         List<InvPreInProductDetailEntity> datas =
                 invPreInProductDetailDao.selectList(new QueryWrapper<InvPreInProductDetailEntity>().eq("relId", relId).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo)
                         .eq(StrUtil.isNotEmpty(supId), "supId", supId).eq(StrUtil.isNotEmpty(deptCode), "deptCode", deptCode).eq("invCode", invCode).eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo)
-                        .and(i-> i.isNull(StrUtil.isEmpty(batchNo), "batchNo").or().eq(StrUtil.isEmpty(batchNo), "batchNo", "")));
+                        .and(StrUtil.isEmpty(batchNo), i -> i.isNull("batchNo").or().eq("batchNo", "")));
 
         int count = 0;
         if (CollUtil.isNotEmpty(datas)) {

src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java

@@ -190,7 +190,11 @@ public class InvPreProductDetailServiceImpl implements InvPreProductDetailServic
         }
         List<InvPreProductDetailEntity> datas =
                 invPreProductDetailDao.selectList(new QueryWrapper<InvPreProductDetailEntity>().eq("relId", relId).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo)
-                        .isNull(StrUtil.isEmpty(batchNo), "batchNo").eq(StrUtil.isNotEmpty(supId), "supId", supId).eq(StrUtil.isNotEmpty(deptCode), "deptCode", deptCode).eq("invCode", invCode).eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode));
+                       .eq(StrUtil.isNotEmpty(supId), "supId", supId)
+                        .eq(StrUtil.isNotEmpty(deptCode), "deptCode", deptCode).eq("invCode", invCode)
+                        .eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode)
+                        .and(StrUtil.isEmpty(batchNo), i -> i.isNull("batchNo").or().eq("batchNo", "")))
+                ;
 
         int count = 0;
         if (CollUtil.isNotEmpty(datas)) {

src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java

@@ -183,7 +183,8 @@ public class InvProductDetailServiceImpl implements InvProductDetailService {
         List<InvProductDetailEntity> datas =
                 invProductDetailDao.selectList(new QueryWrapper<InvProductDetailEntity>().eq("relId", relId).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo)
                         .eq(StrUtil.isNotEmpty(supId), "supId", supId).eq("deptCode", deptCode).eq("invCode", invCode)
-                        .eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode) .isNull(StrUtil.isEmpty(batchNo), "batchNo").or().eq(StrUtil.isEmpty(batchNo),"batchNo","")
+                        .eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode)
+                        .and(StrUtil.isEmpty(batchNo), i -> i.isNull("batchNo").or().eq("batchNo", ""))
                 );
 
         int count = 0;

src/main/java/com/glxp/api/task/VailInvTask.java

@@ -24,8 +24,8 @@ import javax.annotation.Resource;
 import java.util.List;
 
 @Slf4j
-@Component
+//@Component
-@Transactional(rollbackFor = Exception.class)
+//@Transactional(rollbackFor = Exception.class)
 public class VailInvTask implements SchedulingConfigurer {
 
 

src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_zyy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:

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

@@ -119,9 +119,9 @@
         </where>
     </select>
 
-    <select id="getfilterOrderList" resultType="com.glxp.api.res.inout.IoOrderDetailCodeResponse">
+    <select id="getfilterOrderList" resultType="com.glxp.api.res.inout.IoOrderDetailResultResponse">
         select *
-        from io_order_detail_code
+        from io_order_detail_result
         <where>
             <if test="orderIdFk != null and orderIdFk != ''">
                 AND orderIdFk = #{orderIdFk}
@@ -133,6 +133,6 @@
                 AND batchNo = #{batchNo}
             </if>
         </where>
-        group by io_order_detail_code.id
+        group by io_order_detail_result.id
     </select>
 </mapper>

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

@@ -608,4 +608,3 @@ CALL Pro_Temp_ColumnWork('io_order', 'fromSpmsOrders', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkReview', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'secCheckReview', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckReview', 'tinyint', 1);
-