修改bug

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

@@ -81,6 +81,14 @@ public class InvSubWarehouseController {
                 }
             }
         } else {
+            if(filterInvWarehouseRequest.getFilter()==3 && filterInvWarehouseRequest.getFilter()!=null){
+                AuthAdmin authAdmin = customerService.getUserBean();
+                if (authAdmin.getCustomerId().equals("110"))
+                    filterInvWarehouseRequest.setUserId(authAdmin.getId() + "");
+                else {
+                    filterInvWarehouseRequest.setSpUse(true);
+                }
+            }else{
                 //走这边表示单据选择的是往来单位里面调出调入的库
                 //判断单据类型是1就是设置单据需要需要查询除自己以外的分库
                 SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("corp_innor_inv");
@@ -107,6 +115,7 @@ public class InvSubWarehouseController {
                     filterInvWarehouseRequest.setCode(null);
                 }
             }
+        }
 
         List<InvSubWarehouseEntity> invSubWarehouseEntities = invSubWarehouseService.filterGroupInvSub(filterInvWarehouseRequest);
         return ResultVOUtils.success(invSubWarehouseEntities);

api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/PurApplyController.java

@@ -161,7 +161,7 @@ public class PurApplyController {
         purApplyService.update(purApplyEntity);
 
         //审核通过后转换成采购计划单
-        if (purApplyEntity.getStatus() == ConstantStatus.APPLY_AUDIT_ED && purApplyRequest.isAudtoPlan()) {
+        if (purApplyEntity.getStatus() == ConstantStatus.APPLY_AUDIT_ED && purApplyRequest.isGeneratePlan()) {
             PurPlanEntity purPlanEntity = new PurPlanEntity();
             String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.JH_ORDER, "yyyyMMdd"));
             purPlanEntity.setBillNo(billNo);

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

@@ -263,8 +263,6 @@ public class InvProductsTrService {
                 if (locWarehouseEntity.getLevel() > 1) {
 
                     InvSubWarehouseEntity subWarehouseEntity = invSubWarehouseService.findByInvSubByCode(bussinessChangeTypeEntity.getDefaultSubInv());
-
-
                     for (WarehouseEntity tempEntity : warehouseEntities) {
                         tempEntity.setFromCorp(subWarehouseEntity.getName());
                         tempEntity.setFromCorpId(subWarehouseEntity.getParentId());