udims单据上传修改，库存预验收库存批次号错误bug

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java

@@ -12,6 +12,7 @@ import com.glxp.sale.admin.entity.basic.CndidateRequest;
 import com.glxp.sale.admin.entity.inout.OrderEntity;
 import com.glxp.sale.admin.exception.JsonException;
 import com.glxp.sale.admin.req.basic.BussinessTypeFilterRequest;
+import com.glxp.sale.admin.req.basic.UdimsFilterRequest;
 import com.glxp.sale.admin.req.info.DeleteRequest;
 import com.glxp.sale.admin.req.inout.OrderFilterRequest;
 import com.glxp.sale.admin.res.PageSimpleResponse;
@@ -140,8 +141,6 @@ public class BussinessTypeController {
     }
 
 
-
-
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/bussinessType/filterAllByUser")
     public BaseResponse filterAllByUser(BussinessTypeFilterRequest bussinessTypeFilterRequest,
@@ -168,18 +167,20 @@ public class BussinessTypeController {
 
 
     @GetMapping("/udiwms/bussinessType/udimsFilter")
-    public BaseResponse udimsFilter(BussinessTypeFilterRequest bussinessTypeFilterRequest,
+    public BaseResponse udimsFilter(UdimsFilterRequest udimsFilterRequest,
                                     BindingResult bindingResult) {
 
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
+        BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest();
         bussinessTypeFilterRequest.setSpUse(true);
-        List<BussinessTypResponse> bussinessTypeEntities;
-        bussinessTypeEntities = bussinessTypeService.filterJoinList(bussinessTypeFilterRequest);
-        PageInfo<BussinessTypResponse> pageInfo;
+        bussinessTypeFilterRequest.setLocSubInvCode(udimsFilterRequest.getInvSubCode());
+        List<BussinessTypeEntity> bussinessTypeEntities;
+        bussinessTypeEntities = bussinessTypeService.filterAllByUser(bussinessTypeFilterRequest);
+        PageInfo<BussinessTypeEntity> pageInfo;
         pageInfo = new PageInfo<>(bussinessTypeEntities);
-        PageSimpleResponse<BussinessTypResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        PageSimpleResponse<BussinessTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(bussinessTypeEntities);
         return ResultVOUtils.success(pageSimpleResponse);

api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java

@@ -22,9 +22,11 @@ import com.glxp.sale.admin.entity.thrsys.ThrInvWarehouseEntity;
 import com.glxp.sale.admin.req.basic.BasicExportStatusRequest;
 import com.glxp.sale.admin.req.basic.BussinessTypeFilterRequest;
 import com.glxp.sale.admin.req.basic.FilterBasicThirdSysRequest;
+import com.glxp.sale.admin.req.basic.UdimsFilterRequest;
 import com.glxp.sale.admin.req.info.DeleteRequest;
 import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest;
 import com.glxp.sale.admin.res.PageSimpleResponse;
+import com.glxp.sale.admin.res.basic.BussinessTypResponse;
 import com.glxp.sale.admin.res.inventory.InvWarehouseExportResponse;
 import com.glxp.sale.admin.res.inventory.InvWarehouseResponse;
 import com.glxp.sale.admin.res.inventory.InvWarehouseThirdSysResponse;
@@ -108,6 +110,27 @@ public class InvWarehouseController {
     }
 
 
+    @GetMapping("/udiwms/bussinessType/udims/filterHighterInv")
+    public BaseResponse udimsFilterHighterInv(UdimsFilterRequest udimsFilterRequest,
+                                              BindingResult bindingResult) {
+        FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
+        filterInvWarehouseRequest.setPcode("0");
+        filterInvWarehouseRequest.setStatus(1);
+        List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterGroupInvWarehouse(filterInvWarehouseRequest);
+        return ResultVOUtils.success(invWarehouseEntities);
+    }
+
+
+    @GetMapping("/udiwms/bussinessType/udims/filterSubInv")
+    public BaseResponse udimsFilterSubInv(UdimsFilterRequest udimsFilterRequest,
+                                          BindingResult bindingResult) {
+
+        List<InvSubWarehouseEntity> invWarehouseEntities = invSubWarehouseService.findByParentId(udimsFilterRequest.getInvCode());
+        return ResultVOUtils.success(invWarehouseEntities);
+
+    }
+
+
     @AuthRuleAnnotation("")
     @GetMapping("spms/inv/warehouse/filterByUser")
     public BaseResponse filterByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) {

api-admin/src/main/java/com/glxp/sale/admin/req/basic/UdimsFilterRequest.java

@@ -0,0 +1,10 @@
+package com.glxp.sale.admin.req.basic;
+
+import lombok.Data;
+
+@Data
+public class UdimsFilterRequest {
+
+    private String invCode;
+    private String invSubCode;
+}

api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java

@@ -163,6 +163,8 @@ public class InvProductsTrService {
                         int count = actCount * warehouseEntity.getCount();
                         InvProductEntity preInvEntity = invPreInProductService.selectByUuid(erpOrderEntity.getGoodsid(), erpOrderEntity.getBatchNo(),
                                 warehouseEntity.getSupId(), null, null);
+
+                        if (preInvEntity != null) {
                             if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
                                 preInvEntity.setOutCount(preInvEntity.getOutCount() + count);
                             }
@@ -173,6 +175,8 @@ public class InvProductsTrService {
                         }
 
                     }
+
+                }
             }
 
             //根据单据详情与条码生成库存码明细