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

src/main/java/com/glxp/api/controller/auth/DeptController.java

@@ -46,7 +46,6 @@ public class DeptController {
     InvWarehouseService invWarehouseService;
 
 
-
     @AuthRuleAnnotation("")
     @GetMapping("spms/inv/warehouse/filter")
     public BaseResponse filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) {
@@ -260,6 +259,7 @@ public class DeptController {
 
     @Resource
     DeptUserService deptUserService;
+
     @AuthRuleAnnotation("")
     @PostMapping("/spms/inv/warehouse/delete")
     public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) {
@@ -361,5 +361,4 @@ public class DeptController {
     }
 
 
-
 }

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

@@ -160,19 +160,11 @@ public class BasicCorpController {
         basicUnitMaintainFilterRequest.setOutType(ConstantStatus.CORP_SICK_SICK);
         List<BasicCorpEntity> basicUnitMaintainEntities;
         basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
-
-        List<BasicUnitMaintainResponse> basicUnitMaintainResponses = basicUnitMaintainEntities.stream().map(item ->
-        {
-            BasicUnitMaintainResponse basicUnitMaintainResponse = new BasicUnitMaintainResponse();
-            BeanUtils.copyProperties(item, basicUnitMaintainResponse);
-            basicUnitMaintainResponse.setUnitId(item.getErpId());
-            return basicUnitMaintainResponse;
-        }).collect(Collectors.toList());
-        PageInfo<BasicUnitMaintainResponse> pageInfo;
-        pageInfo = new PageInfo<>(basicUnitMaintainResponses);
-        PageSimpleResponse<BasicUnitMaintainResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        PageInfo<BasicCorpEntity> pageInfo;
+        pageInfo = new PageInfo<>(basicUnitMaintainEntities);
+        PageSimpleResponse<BasicCorpEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
-        pageSimpleResponse.setList(basicUnitMaintainResponses);
+        pageSimpleResponse.setList(basicUnitMaintainEntities);
         return ResultVOUtils.success(pageSimpleResponse);
     }
 

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

@@ -801,7 +801,6 @@ public class IoCheckInoutService {
             orderEntity.setUpdateTime(new Date());
             orderEntity.setAuditTime(new Date());
             orderService.update(orderEntity);
-            List<IoCodeEntity> codeEntities = codeService.findByOrderId(orderEntity.getBillNo());
             genInv(orderEntity, bussinessTypeEntity);
         }
     }
@@ -935,9 +934,12 @@ public class IoCheckInoutService {
     @Resource
     InvWarehouseService invWarehouseService;
 
-    public void genBackOrder(IoOrderEntity orderEntity, List<IoCodeEntity> backCodeList) {
-        if (CollUtil.isEmpty(backCodeList))
+    public void genBackOrder(IoOrderEntity orderEntity, List<IoCodeEntity> allCodeList) {
+        if (CollUtil.isEmpty(allCodeList))
             return;
+        Map<String, List<IoCodeEntity>> map = allCodeList.stream().collect(Collectors.groupingBy(t -> t.getSupId()));
+        for (Map.Entry<String, List<IoCodeEntity>> entry : map.entrySet()) {
+            List<IoCodeEntity> backCodeList = entry.getValue();
             BasicBussinessTypeEntity basicBussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
             if (StrUtil.isNotEmpty(basicBussinessTypeEntity.getPreInBackAction())) {
                 IoOrderEntity outOrder = new IoOrderEntity();
@@ -986,6 +988,8 @@ public class IoCheckInoutService {
 
             }
 
+        }
+
 
     }
 

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

@@ -110,6 +110,7 @@ public class InvCountOrderDetailServiceImpl implements InvCountOrderDetailServic
                     InvCountCodesEntity codesEntity = codesMap.get(code);
                     if (null == codesEntity) {
                         //构造条码信息
+                        codesEntity = new InvCountCodesEntity();
                         codesEntity.setCode(code);
                         codesEntity.setOrderIdFk(orderId);
                         codesEntity.setCount(1);

src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml

@@ -24,9 +24,6 @@
             <if test="id != '' and id != null">
                 AND id = #{id}
             </if>
-            <if test="unitId != '' and unitId != null">
-                AND unitId = #{unitId}
-            </if>
             <if test="erpId != '' and erpId != null">
                 AND erpId = #{erpId}
             </if>