Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
#	src/main/java/com/glxp/api/controller/inout/IoOrderDetailCodeController.java
#	src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java

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

@@ -57,8 +57,8 @@ public class IoOrderDetailBizController extends BaseController {
     //获取单据业务详情---临时接口查询
     @AuthRuleAnnotation("")
     @GetMapping("udiwms/inout/order/draft/biz")
-    public BaseResponse getDraftsDetailCode() {
-        List<IoOrderDetailBizEntity> orderEntityList = ioOrderDetailBizDao.selectList();
+    public BaseResponse getDraftsDetailCode(String orderId) {
+        List<IoOrderDetailBizEntity> orderEntityList = orderDetailBizService.checkOrderList(orderId);
         PageSimpleResponse<IoOrderDetailBizEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(100l);
         pageSimpleResponse.setList(orderEntityList);
@@ -126,7 +126,7 @@ public class IoOrderDetailBizController extends BaseController {
      * @param orderDetailBizRequest
      * @return
      */
-    @GetMapping("/udiwms/inout/order/detail/biz/filterList")
+    @GetMapping("/udiwms/inout/bizDetail/filterList")
     public BaseResponse filterList(FilterOrderDetailBizRequest orderDetailBizRequest) {
         List<IoOrderDetailBizResponse> list = orderDetailBizService.filterList(orderDetailBizRequest);
         PageInfo<IoOrderDetailBizResponse> pageInfo = new PageInfo<>(list);

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

@@ -47,7 +47,7 @@ public class IoOrderDetailCodeController {
      * @param detailCodeRequest
      * @return
      */
-    @GetMapping("udiwms/inout/order/detail/code/filterList")
+    @GetMapping("udiwms/inout/codeDetail/filterList")
     public BaseResponse filterList(FilterOrderDetailCodeRequest detailCodeRequest) {
         List<IoOrderDetailCodeResponse> list = ioOrderDetailCodeService.filterList(detailCodeRequest);
         PageInfo<IoOrderDetailCodeResponse> pageInfo = new PageInfo<>(list);

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

@@ -27,7 +27,7 @@ public class IoOrderDetailResultController {
      * @param orderDetailResultRequest
      * @return
      */
-    @GetMapping("/udiwms/inout/order/detail/result/filterList")
+    @GetMapping("/udiwms/inout/resultDetail/filterList")
     public BaseResponse filterList(FilterOrderDetailResultRequest orderDetailResultRequest) {
         List<IoOrderDetailResultResponse> list = orderDetailResultService.filterList(orderDetailResultRequest);
         PageInfo<IoOrderDetailResultResponse> pageInfo = new PageInfo<>(list);

src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java

@@ -142,12 +142,6 @@ public class IoOrderDetailBizEntity implements Serializable {
     @TableField(value = "`count`")
     private Integer count;
 
-    /**
-     * 扫码数量
-     */
-    @TableField(value = "reCount")
-    private Integer reCount;
-
     /**
      * 备注
      */
@@ -188,5 +182,8 @@ public class IoOrderDetailBizEntity implements Serializable {
     @TableField(exist = false)
     private boolean checkSuccess;
 
+    @TableField(exist = false)
+    private Integer scanCount;
+
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java

@@ -187,5 +187,8 @@ public class IoOrderDetailCodeEntity implements Serializable {
     @TableField(exist = false)
     private boolean checkSuccess;
 
+    @TableField(exist = false)
+    private Integer orderCount;
+
     private static final long serialVersionUID = 1L;
 }

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

@@ -118,7 +118,7 @@ public class IoOrderDetailBizResponse {
     private Integer count;
 
     /**
-     * 扫码数量
+     * 实际数量
      */
     private Integer reCount;
 
@@ -152,7 +152,10 @@ public class IoOrderDetailBizResponse {
      */
     private String remark5;
 
+    //扫码数量
+    private Integer scanCount;
 
     private boolean checkSuccess;
 
+
 }

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

@@ -235,6 +235,52 @@ public class IoCheckInoutService {
         }
     }
 
+    //业务单正向校验
+    public void bizOrderCheck(List<IoOrderDetailBizEntity> orderDetailBizEntities, List<IoOrderDetailCodeEntity> orderDetailCodeEntities) {
+        for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) {
+            for (IoOrderDetailCodeEntity codeEntity : orderDetailCodeEntities) {
+                if (!bizEntity.isCheckSuccess() && !codeEntity.isCheckSuccess() && checkId(bizEntity, codeEntity) == null
+                        && checkBatchNo(bizEntity, codeEntity) == null
+                        && checkProductDate(bizEntity, codeEntity) == null
+                        && checkExpireDate(bizEntity, codeEntity) == null
+                ) {
+
+                    if (checkCount(bizEntity, codeEntity) == null) {
+                        bizEntity.setCheckSuccess(true);
+                        codeEntity.setCheckSuccess(true);
+                    } else {
+                        bizEntity.setScanCount(codeEntity.getReCount());
+                        bizEntity.setCheckSuccess(false);
+                    }
+                    break;
+                }
+            }
+        }
+    }
+
+    //扫码单反向校验
+    public void codeOrderCheck(List<IoOrderDetailCodeEntity> orderDetailCodeEntities, List<IoOrderDetailBizEntity> orderDetailBizEntities) {
+        for (IoOrderDetailCodeEntity codeEntity : orderDetailCodeEntities) {
+            for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) {
+                if (!bizEntity.isCheckSuccess() && !codeEntity.isCheckSuccess() && checkId(bizEntity, codeEntity) == null
+                        && checkBatchNo(bizEntity, codeEntity) == null
+                        && checkProductDate(bizEntity, codeEntity) == null
+                        && checkExpireDate(bizEntity, codeEntity) == null
+                ) {
+
+                    if (checkCount(bizEntity, codeEntity) == null) {
+                        bizEntity.setCheckSuccess(true);
+                        codeEntity.setCheckSuccess(true);
+                    } else {
+                        codeEntity.setOrderCount(bizEntity.getCount());
+                    }
+                    break;
+                }
+            }
+        }
+
+    }
+
     //二次校验
     public void checkSecond(IoOrderEntity orderEntity) {
         BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
@@ -353,7 +399,7 @@ public class IoCheckInoutService {
     }
 
     public String checkCount(IoOrderDetailBizEntity bizEntity, IoOrderDetailCodeEntity codeEntity) {
-        if (bizEntity.getReCount() == codeEntity.getReCount()) {
+        if (bizEntity.getCount() == codeEntity.getReCount()) {
             return null;
         }
         return bizEntity.getCoName() + "数量不匹配！";

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

@@ -16,7 +16,10 @@ public interface IoOrderDetailBizService {
 
     int deleteById(Integer id);
 
-    boolean isExit(Long relId, String bacthNo,Integer ignoreId);
+    boolean isExit(Long relId, String bacthNo, Integer ignoreId);
 
     List<IoOrderDetailBizResponse> filterList(FilterOrderDetailBizRequest orderDetailBizRequest);
+
+
+    List<IoOrderDetailBizEntity> checkOrderList(String orderId);
 }

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

@@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.inout.IoOrderDetailBizDao;
 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
+import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
 import com.glxp.api.req.inout.FilterOrderDetailBizRequest;
 import com.glxp.api.res.inout.IoOrderDetailBizResponse;
+import com.glxp.api.service.inout.IoCheckInoutService;
 import com.glxp.api.service.inout.IoOrderDetailBizService;
+import com.glxp.api.service.inout.IoOrderDetailCodeService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -56,4 +59,19 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
         return ioOrderDetailBizDao.filterList(orderDetailBizRequest);
     }
 
+
+    @Resource
+    IoOrderDetailCodeService orderDetailCodeService;
+    @Resource
+    IoCheckInoutService checkInoutService;
+
+    @Override
+    public List<IoOrderDetailBizEntity> checkOrderList(String orderId) {
+
+        List<IoOrderDetailBizEntity> orderDetailBizEntities = findByOrderId(orderId);
+        List<IoOrderDetailCodeEntity> codeEntities = orderDetailCodeService.findByOrderId(orderId);
+        checkInoutService.bizOrderCheck(orderDetailBizEntities, codeEntities);
+        return orderDetailBizEntities;
+    }
+
 }