opt: 修复9

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java

@@ -395,7 +395,7 @@ public class PdaIosInServiceImpl implements PdaIosInService {
                 .orderByAsc(SchBasePoint::getIn_order_seq));
         List<SelectItemVo> selectList = new ArrayList<>();
         schBasePointList.forEach(r ->
-                selectList.add(SelectItemVo.builder().text( r.getPoint_code()).value(r.getPoint_code()).build())
+                selectList.add(SelectItemVo.builder().text( r.getPoint_name()).value(r.getPoint_code()).build())
         );
         return PdaResponse.requestParamOk(selectList);
     }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaSchPointServiceImpl.java

@@ -6,7 +6,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.nl.common.domain.query.PageQuery;
 import org.nl.common.domain.vo.SelectItemVo;
+import org.nl.common.exception.BadRequestException;
+import org.nl.common.utils.SecurityUtils;
+import org.nl.common.utils.dto.CurrentUser;
 import org.nl.wms.basedata_manage.service.IMdPbStoragevehicleinfoService;
 import org.nl.wms.basedata_manage.service.IStructattrService;
 import org.nl.wms.basedata_manage.service.dao.Structattr;
@@ -17,6 +23,10 @@ import org.nl.wms.sch_manage.service.ISchBaseRegionService;
 import org.nl.wms.sch_manage.service.dao.SchBasePoint;
 import org.nl.wms.sch_manage.service.dao.SchBaseRegion;
 import org.nl.wms.sch_manage.service.dao.mapper.SchBasePointMapper;
+import org.nl.wms.system_manage.service.dept.dao.SysDept;
+import org.nl.wms.system_manage.service.user.ISysUserService;
+import org.nl.wms.system_manage.service.user.dto.SysUserDetail;
+import org.nl.wms.system_manage.service.user.dto.UserQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -46,6 +56,8 @@ public class PdaSchPointServiceImpl extends ServiceImpl<SchBasePointMapper, SchB
     private ISchBasePointService pointService;
     @Autowired
     private IStructattrService iStructattrService;
+    @Autowired
+    private ISysUserService userService;
 
     @Override
     public PdaResponse getPoint(JSONObject whereJson) {
@@ -120,13 +132,38 @@ public class PdaSchPointServiceImpl extends ServiceImpl<SchBasePointMapper, SchB
 
     @Override
     public PdaResponse structList(JSONObject whereJson) {
+        List<String> deptCodeS = getcurrentUserDepts();
         List<SelectItemVo> list = iStructattrService.list(new LambdaQueryWrapper<Structattr>()
+                        .eq(Structattr::getStor_code, "LT")
+                        .in(Structattr::getSect_code, deptCodeS)
                         .orderByAsc(Structattr::getStruct_code)).stream().map(p -> SelectItemVo
                         .builder()
-                        .text(p.getStruct_code())
+                        .text(p.getStruct_name() + "-" + p.getSect_name()
+                                + " - " + getName(p.getOccupancy_state()))
                         .value(p.getStruct_code())
                         .build())
                 .collect(Collectors.toList());
         return PdaResponse.requestParamOk(list);
     }
+
+    private List<String> getcurrentUserDepts() {
+        CurrentUser currentUser = SecurityUtils.getCurrentUser();
+        if(null ==  currentUser ){
+            throw new BadRequestException("当前用户未登录，请先登录！");
+        }
+        UserQuery query = new UserQuery();
+        PageQuery pageQuery = new PageQuery();
+        query.setUser_name(currentUser.getUsername());
+        List<SysUserDetail> sysUserDetails = userService.getUserDetail(query,pageQuery);
+        if(CollectionUtils.isEmpty(sysUserDetails) ){
+            throw new BadRequestException("用户异常");
+        }
+        List<SysDept> deptS = sysUserDetails.get(0).getDepts();
+        List<String> deptCodeS = deptS.stream().map(SysDept::getCode).collect(Collectors.toList());
+        return deptCodeS;
+    }
+
+    public String getName(Integer status) {
+        return 1 == status ? "空位" : 2 == status ? "空桶" : "满桶";
+    }
 }