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

src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java

@@ -127,11 +127,20 @@ public class UdiRelevanceController extends BaseController {
             if (StrUtil.isNotEmpty(filterUdiRelRequest.getUdiCode())) {
                 UdiEntity udiEntity = FilterUdiUtils.getUdi(filterUdiRelRequest.getUdiCode());
                 filterUdiRelRequest.setNameCode(udiEntity.getUdi());
+                List<UdiRelevanceResponse> temps = udiRelevanceService.filterUdiGp(filterUdiRelRequest);
+                if (temps != null && temps.size() > 0) {
+                    filterUdiRelRequest.setOriginUuid(temps.get(0).getOriginUuid());
+                }
             }
-            List<UdiRelevanceResponse> temps = udiRelevanceService.filterUdiGp(filterUdiRelRequest);
+
-            if (temps != null && temps.size() > 0) {
+        } else if (StrUtil.isNotEmpty(filterUdiRelRequest.getUnionCode()) && StrUtil.isEmpty(filterUdiRelRequest.getUdiCode())) {
-                filterUdiRelRequest.setOriginUuid(temps.get(0).getOriginUuid());
+            if (StrUtil.isNotEmpty(filterUdiRelRequest.getUnionCode())) {
-                filterUdiRelRequest.setNameCode(null);
+                filterUdiRelRequest.setNameCode(filterUdiRelRequest.getUnionCode());
+                List<UdiRelevanceResponse> temps = udiRelevanceService.filterUdiGp(filterUdiRelRequest);
+                if (temps != null && temps.size() > 0) {
+                    filterUdiRelRequest.setOriginUuid(temps.get(0).getOriginUuid());
+                    filterUdiRelRequest.setNameCode(null);
+                }
             }
         } else {
             filterUdiRelRequest.setDiType(1);

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

@@ -37,6 +37,7 @@ import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
 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.*;
@@ -711,9 +712,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.getfilterOrderList(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()));
             }
@@ -732,7 +733,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

@@ -19,10 +19,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;
@@ -135,8 +132,8 @@ public class IoOrderInvoiceController {
             //查询单据详情
             FilterOrderDetailCodeRequest orderDetailBizRequest = new FilterOrderDetailCodeRequest();
             orderDetailBizRequest.setOrderIdFk(orderFk);
-            List<IoOrderDetailCodeResponse> ioOrderDetailCodeResponses = orderDetailBizService.getfilterOrderList(orderDetailBizRequest);
+            List<IoOrderDetailResultResponse> ioOrderDetailCodeResponses = orderDetailBizService.getfilterOrderList(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/dao/inout/IoOrderDetailBizDao.java

@@ -6,6 +6,7 @@ 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;
 
@@ -23,11 +24,11 @@ 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);
 
-    List<IoOrderInvoiceResponse> selectByorderIdFk(String  orderIdFk);
+    List<IoOrderInvoiceResponse> selectByorderIdFk(String orderIdFk);
 
     IoOrderInvoiceResponse selectByinvoiceId(Long id);
 

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

@@ -163,4 +163,17 @@ public class IoOrderDetailResultResponse {
     private Date auditTime;
 
 
+
+    private int orderCount;
+
+    private String invoiceCodes;
+
+    private Integer sucCount;
+
+    private boolean regStatus;
+
+    //金额
+    private BigDecimal amount;
+
+
 }

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

@@ -5,6 +5,7 @@ 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;
@@ -38,7 +39,7 @@ public interface IoOrderDetailBizService {
 
     List<IoOrderDetailCodeResponse> getfilterList(FilterOrderDetailCodeRequest orderDetailBizRequest);
 
-    List<IoOrderDetailCodeResponse> getfilterOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest);
+    List<IoOrderDetailResultResponse> getfilterOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest);
 
     IoOrderDetailBizEntity selectByBatchNoAndBindRlFk(String batchNo, String bindRlFk);
 

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

@@ -14,6 +14,7 @@ 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.inout.IoCheckInoutService;
 import com.glxp.api.service.inout.IoOrderDetailBizService;
@@ -133,7 +134,7 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
     }
 
     @Override
-    public List<IoOrderDetailCodeResponse> getfilterOrderList(FilterOrderDetailCodeRequest OrderDetailCodeRequest) {
+    public List<IoOrderDetailResultResponse> getfilterOrderList(FilterOrderDetailCodeRequest OrderDetailCodeRequest) {
         if (null == OrderDetailCodeRequest) {
             return Collections.emptyList();
         }

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>