Merge remote-tracking branch 'origin/master'

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/RoleCodeListQuery.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.portal.api.sysstaffinfo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/10 16:53
+ */
+@Data
+public class RoleCodeListQuery {
+    @ApiModelProperty("分公司sid")
+    private String createOrgSid;
+    @ApiModelProperty("角色编码")
+    private List<String> roleCode;
+
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/StaffByRole.java

@@ -0,0 +1,17 @@
+package com.yxt.anrui.portal.api.sysstaffinfo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/10 16:50
+ */
+@Data
+public class StaffByRole {
+    @ApiModelProperty("姓名")
+    private String manager;
+    @ApiModelProperty("userSid")
+    private String managerSid;
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java

@@ -96,6 +96,10 @@ public interface SysStaffinfoFeign {
     @GetMapping("/getStaffName")
     public ResultBean<List<Map<String, String>>> getStaffName(@RequestParam(value = "staffName", required = false) String staffName, @RequestParam(value = "deptSid") String deptSid);
 
+    @ApiOperation("根据角色编码获取分公司下人员")
+    @PostMapping("/getStaffNameByRole")
+    public ResultBean<List<StaffByRole>> getStaffNameByRoleCode(@RequestBody RoleCodeListQuery query);
+
     /**
      * 获取部门内全部员工姓名
      *
@@ -159,4 +163,4 @@ public interface SysStaffinfoFeign {
     ResultBean<List<PcSysStaffVo>> selectStaffListss();
 
 
-}
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java

@@ -31,7 +31,7 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign {
         ResultBean rb = ResultBean.fireFail();
         return rb.setMsg("接口anrui_portal/sysstaffinfo/listPage无法访问");
     }
-	
+
     @Override
     public ResultBean save(SysStaffinfoDto dto) {
         return ResultBean.fireFail().setMsg("接口anrui_portal/sysstaffinfo/save无法访问");
@@ -58,6 +58,11 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<StaffByRole>> getStaffNameByRoleCode(RoleCodeListQuery query) {
+        return null;
+    }
+
     @Override
     public ResultBean<List<Map<String, String>>> getStaffNameByDeptSid(String staffName, String deptSid) {
         return null;
@@ -113,4 +118,4 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign {
         return null;
     }
 
-}
+}

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java

@@ -125,4 +125,6 @@ public interface SysStaffinfoMapper extends BaseMapper<SysStaffinfo> {
 
     List<PcSysStaffVo> selectStaffLists();
     List<PcSysStaffVo> selectStaffListss();
-}
+
+    List<StaffByRole> getStaffNameByRoleCode(@Param("orgSidPath") String orgSidPath, @Param("list") List<String> list);
+}

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml

@@ -395,4 +395,20 @@
         from sys_user su
                  left join sys_staffinfo si on su.staffSid = si.sid where su.isAdmin is NULL and si.personTypeKey != '01'
     </select>
-</mapper>
+    <select id="getStaffNameByRoleCode" resultType="com.yxt.anrui.portal.api.sysstaffinfo.StaffByRole">
+        SELECT
+            u.sid as manager,
+            sf.`name` as managerSid
+        FROM
+            sys_user_role AS ur
+                LEFT JOIN sys_role AS r ON ur.roleSid = r.sid
+                LEFT JOIN sys_user as u ON ur.userSid = u.sid
+                LEFT JOIN sys_staffinfo as sf ON u.staffSid = sf.sid
+                LEFT JOIN sys_staff_org as so ON sf.sid = so.staffSid
+        WHERE so.orgSidPath like CONCAT( '%', #{orgSidPath}, '%' )
+          AND r.code IN
+        <foreach collection="list" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
+</mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java

@@ -142,6 +142,13 @@ public class SysStaffinfoRest implements SysStaffinfoFeign {
         return rb.success().setData(staffNameList);
     }
 
+    @Override
+    public ResultBean<List<StaffByRole>> getStaffNameByRoleCode(RoleCodeListQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        List<StaffByRole> list = sysStaffinfoService.getStaffNameByRoleCode(query);
+        return rb.success().setData(list);
+    }
+
     @Override
     public ResultBean<List<Map<String, String>>> getStaffNameByDeptSid(String staffName, String deptSid) {
         ResultBean rb = ResultBean.fireFail();

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java

@@ -233,9 +233,9 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
                 for (String s : split) {
                     //获取本级sid获取本级部门信息
                     SysOrganization sysOrganization = sysOrganizationService.fetchBySid(s);
-                    if(sysOrganization == null){
+                    if (sysOrganization == null) {
                         sysStaffOrgService.delByOrgSid(s);
-                    }else{
+                    } else {
                         //从本级部门信息中获取上级sid
                         String psid = sysOrganization.getPsid();
                         //从本级部门信息中获取本级部门名称
@@ -576,23 +576,23 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         if (count > 0) {
             sysStaffOrgService.deleteByStaffSidAndType(sysStaffOrgDto.getOrgSidPath(), sid, "2");
         }
-        SysStaffOrg sysStaffOrg = sysStaffOrgService.getOrgByStaffSidAndPath(sid,sysStaffOrgDto.getOrgSidPath());
-        if(sysStaffOrg == null){
+        SysStaffOrg sysStaffOrg = sysStaffOrgService.getOrgByStaffSidAndPath(sid, sysStaffOrgDto.getOrgSidPath());
+        if (sysStaffOrg == null) {
             ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgService.selectAllByStaffSid(sid);
             sysStaffOrg = staffOrgResultBean.getData();
-            if(sysStaffOrg == null){
+            if (sysStaffOrg == null) {
                 sysStaffOrg = new SysStaffOrg();
                 sysStaffOrg.setStaffSid(sid);
-                BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg);
+                BeanUtil.copyProperties(sysStaffOrgDto, sysStaffOrg);
                 sysStaffOrg.setManageType("3");
                 sysStaffOrgService.insert(sysStaffOrg);
-            }else{
-                BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg);
+            } else {
+                BeanUtil.copyProperties(sysStaffOrgDto, sysStaffOrg);
                 sysStaffOrg.setManageType("3");
                 sysStaffOrgService.updateById(sysStaffOrg);
             }
-        }else{
-            BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg);
+        } else {
+            BeanUtil.copyProperties(sysStaffOrgDto, sysStaffOrg);
             sysStaffOrg.setManageType("3");
             sysStaffOrgService.updateById(sysStaffOrg);
         }
@@ -660,19 +660,18 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
             SysStaffPostDetailsVo staffPostDetailsVo = sysStaffPostService.getPostByStaffSid(sid);
             SysStaffOrgDetailsVo sysStaffOrgDetailsVo = sysStaffOrgService.selectByStaffByType(sid, orgSid, type);
             SysStaffPostDetailsVo sysStaffPostDetailsVo = sysStaffPostService.selectByStaff(sid, staffPostDetailsVo.getPostSid());
-            if(sysStaffOrgDetailsVo != null){
+            if (sysStaffOrgDetailsVo != null) {
                 sysStaffinfoDetailsVo.setSysStaffOrg(sysStaffOrgDetailsVo);
-            }else{
+            } else {
                 sysStaffinfoDetailsVo.setSysStaffOrg(new SysStaffOrgDetailsVo());
             }
-            if(sysStaffPostDetailsVo != null){
+            if (sysStaffPostDetailsVo != null) {
                 sysStaffinfoDetailsVo.setSysStaffPost(sysStaffPostDetailsVo);
-            }else{
+            } else {
                 sysStaffinfoDetailsVo.setSysStaffPost(new SysStaffPostDetailsVo());
             }
 
 
-
         }
         return sysStaffinfoDetailsVo;
     }
@@ -702,7 +701,7 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         int j = baseMapper.updateBySid(personType, personTypeKey, sysStaffQuery.getSid(), sysStaffQuery.getQuitDate(), sysStaffQuery.getQuitReason());
         //根据staffSid查询token
         String token = sysUserService.selectByStaffsid(sysStaffQuery.getSid()).getToken();
-        if(StringUtils.isNotBlank(token)){
+        if (StringUtils.isNotBlank(token)) {
             //清空该token
             redisUtil.remove(token);
         }
@@ -729,14 +728,14 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         return rb.success().setData(list);
     }
 
-    public List<Map<String, String>> getStaffName(String staffName,String deptSid) {
+    public List<Map<String, String>> getStaffName(String staffName, String deptSid) {
         QueryWrapper<Map<String, Object>> qw = new QueryWrapper<>();
         if (StringUtils.isNotBlank(staffName)) {
             qw.like("ss.name", staffName);
         }
         qw.eq("ss.isDelete", 0);
         qw.ne("sso.orgSid", deptSid);
-        qw.ne("ss.personTypeKey","01");
+        qw.ne("ss.personTypeKey", "01");
         return baseMapper.getStaffName(qw);
     }
 
@@ -747,7 +746,7 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         }
         qw.eq("sso.orgSid", deptSid);
         qw.eq("ss.isDelete", 0);
-        qw.ne("ss.personTypeKey","01");
+        qw.ne("ss.personTypeKey", "01");
         return baseMapper.getStaffNameByDeptSid(qw);
     }
 
@@ -757,18 +756,18 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         QueryWrapper<AppSysStaffVo> qw = new QueryWrapper<>();
         String orgSid = "";
         if (params != null) {
-            if(StringUtils.isNotBlank(params.getOrgPath())){
+            if (StringUtils.isNotBlank(params.getOrgPath())) {
                 String orgPath = params.getOrgPath();
                 orgSid = sysStaffOrgService.getOrgSidByPath(orgPath).getData();
             }
             if (StringUtils.isNotBlank(params.getName())) {
                 qw.like("si.name", params.getName());
             }
-            if (params.getSelectSid() != null && params.getSelectSid().size() > 0){
-                qw.notIn("su.sid",params.getSelectSid());
+            if (params.getSelectSid() != null && params.getSelectSid().size() > 0) {
+                qw.notIn("su.sid", params.getSelectSid());
             }
-            if(params.getState() == 0){
-                qw.eq("si.personTypeKey","02");
+            if (params.getState() == 0) {
+                qw.eq("si.personTypeKey", "02");
             }
         }
         IPage<AppSysStaffVo> pagging = baseMapper.getUserList(page, qw, orgSid);
@@ -789,12 +788,12 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         return p;
     }
 
-    public ResultBean<List<AppSysStaffVo>> getGressionUserList(String userSid,String orgPath) {
+    public ResultBean<List<AppSysStaffVo>> getGressionUserList(String userSid, String orgPath) {
         ResultBean<List<AppSysStaffVo>> rb = ResultBean.fireFail();
         String useOrgSid = "";
-        if(StringUtils.isNotBlank(orgPath)){
+        if (StringUtils.isNotBlank(orgPath)) {
             useOrgSid = sysStaffOrgService.getOrgSidByPath(orgPath).getData();
-        }else{
+        } else {
             useOrgSid = sysStaffOrgService.getPathSidByUserSid(userSid).getData();
         }
         List<AppSysStaffVo> list = baseMapper.getGressionUserList(useOrgSid);
@@ -814,4 +813,13 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         list.removeAll(Collections.singleton(null));
         return rb.success().setData(list);
     }
-}
+
+    public List<StaffByRole> getStaffNameByRoleCode(RoleCodeListQuery query) {
+        String createOrgSid = query.getCreateOrgSid();
+        List<String> roleCode = query.getRoleCode();
+        SysOrganization sysOrganization = sysOrganizationService.fetchBySid(createOrgSid);
+        String orgSidPath = sysOrganization.getOrgSidPath();
+        List<StaffByRole> list = baseMapper.getStaffNameByRoleCode(orgSidPath,roleCode);
+        return list;
+    }
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemMapper.java

@@ -25,7 +25,7 @@ public interface AsServiceItemMapper extends BaseMapper<AsServiceItem> {
 
     int updateBySidIsDelete(List<String> list);
 
-    AsServiceItem checkForInsert(@Param("sitemName")String sitemName, @Param("useOrgSid")String useOrgSid);
+    AsServiceItem checkForInsert(@Param("sitemName") String sitemName, @Param("useOrgSid") String useOrgSid, @Param("subjectSid") String subjectSid);
 
-    AsServiceItem checkForUpdate(@Param("sitemName")String sitemName, @Param("useOrgSid")String useOrgSid, @Param("sid")String sid);
+    AsServiceItem checkForUpdate(@Param("sitemName") String sitemName, @Param("useOrgSid") String useOrgSid, @Param("sid") String sid, @Param("subjectSid") String subjectSid);
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemMapper.xml

@@ -32,6 +32,7 @@
         from as_service_item
         where sitemName = #{sitemName}
           and useOrgSid = #{useOrgSid}
+          and subjectSid = #{subjectSid}
           and isDelete = 0
     </select>
     <select id="checkForUpdate" resultType="com.yxt.anrui.as.api.asserviceitem.AsServiceItem">
@@ -40,6 +41,7 @@
         where sitemName = #{sitemName}
           and useOrgSid = #{useOrgSid}
           and isDelete = 0
+          and subjectSid = #{subjectSid}
           and sid !=#{sid}
     </select>
 </mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java

@@ -46,6 +46,7 @@ public class AsServiceItemService extends MybatisBaseService<AsServiceItemMapper
     private SysUserFeign sysUserFeign;
     @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
+
     private QueryWrapper<AsServiceItem> createQueryWrapper(AsServiceItemQuery query) {
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -125,7 +126,7 @@ public class AsServiceItemService extends MybatisBaseService<AsServiceItemMapper
                 SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
                 useOrgSid = sysOrganization.getSid();
             }
-            qw.eq("a.useOrgSid",useOrgSid);
+            qw.eq("a.useOrgSid", useOrgSid);
         }
         if (StringUtils.isNotBlank(query.getSitemName())) {
             qw.and(wrapper -> wrapper.like("a.sitemName", query.getSitemName()).or().like("a.sitemCode", query.getSitemName()));
@@ -165,18 +166,18 @@ public class AsServiceItemService extends MybatisBaseService<AsServiceItemMapper
             AsServiceItem item = fetchBySid(dto.getSid());
             BeanUtil.copyProperties(dto, item, "id", "sid");
             item.setSitemCode(PinYinUtils.sx(dto.getSitemName()));
-            AsServiceItem entity = baseMapper.checkForUpdate(dto.getSitemName(), dto.getUseOrgSid(), dto.getSid());
+            AsServiceItem entity = baseMapper.checkForUpdate(dto.getSitemName(), dto.getUseOrgSid(), dto.getSid(), dto.getSubjectSid());
             if (null != entity) {
-                return rb.setMsg("维修项目名称不能重复");
+                return rb.setMsg("同一维修项目名称和科目不能重复");
             }
             baseMapper.updateById(item);
         } else {
             AsServiceItem item = new AsServiceItem();
             BeanUtil.copyProperties(dto, item, "id", "sid");
             item.setSitemCode(PinYinUtils.sx(dto.getSitemName()));
-            AsServiceItem entity = baseMapper.checkForInsert(dto.getSitemName(), dto.getUseOrgSid());
+            AsServiceItem entity = baseMapper.checkForInsert(dto.getSitemName(), dto.getUseOrgSid(), dto.getSubjectSid());
             if (null != entity) {
-                return rb.setMsg("维修项目名称不能重复");
+                return rb.setMsg("同一维修项目名称和科目不能重复");
             }
             baseMapper.insert(item);
         }

yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseInfoRest.java

@@ -74,4 +74,13 @@ public class WmsWarehouseInfoRest {
         List<WmsWarehouseAreaAllVo> wmsWarehouseAreaAllVos = wmsWarehouseService.selectAll();
         return rb.success().setData(wmsWarehouseAreaAllVos);
     }
+
+
+    @ApiOperation("查询仓库管理员")
+    @GetMapping("/selMangerByRole")
+    public ResultBean<List<MangerVo>> selMangerByRole(@RequestParam("createOrgSid") String createOrgSid){
+        ResultBean rb = ResultBean.fireFail();
+        List<MangerVo> vos = wmsWarehouseService.selMangerByRole(createOrgSid);
+        return rb.success().setData(vos);
+    }
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.java

@@ -27,4 +27,6 @@ public interface WmsWarehouseAreaMapper extends BaseMapper<WmsWarehouseArea> {
     WmsWarehouseArea checkForUpdate(@Param("areaCode")String areaCode,@Param("warehouseSid") String warehouseSid, @Param("sid")String sid);
 
     List<WmsWarehouseArea> listAll(@Param("useOrgSid") String useOrgSid);
+
+    int selectNum(@Param("warehouseCode") String warehouseCode);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml

@@ -48,6 +48,11 @@
         where b.useOrgSid = #{useOrgSid}
           and a.isDelete = 0
     </select>
+    <select id="selectNum" resultType="java.lang.Integer">
+        select IFNULL(CAST(REPLACE(MAX(areaCode), #{warehouseCode}, '') AS SIGNED), 0) as code
+        from wms_warehouse_area
+        where areaCode LIKE concat(#{warehouseCode}, '%')
+    </select>
     <update id="updateBySidIsDelete">
         UPDATE wms_warehouse_area
         SET isDelete=1

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java

@@ -11,12 +11,14 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfo;
+import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfoService;
 import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfoVo;
 import com.yxt.wms.feign.portal.privilege.PrivilegeQuery;
 import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign;
 import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo;
 import com.yxt.wms.feign.portal.sysuser.SysUserFeign;
 import com.yxt.wms.utils.OrgPathQuery;
+import com.yxt.wms.utils.Rule;
 import lombok.experimental.Accessors;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -37,6 +39,8 @@ public class WmsWarehouseAreaService extends MybatisBaseService<WmsWarehouseArea
     private SysUserFeign sysUserFeign;
     @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
+    @Autowired
+    private WmsWarehouseInfoService warehouseInfoService;
 
     public ResultBean<PagerVo<WmsWarehouseAreaVo>> listPage(PagerQuery<WmsWarehouseAreaQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
@@ -122,25 +126,33 @@ public class WmsWarehouseAreaService extends MybatisBaseService<WmsWarehouseArea
         String sid = "";
         if (StringUtils.isNotBlank(dto.getSid())) {
             sid = dto.getSid();
-            WmsWarehouseArea area = baseMapper.checkForUpdate(dto.getAreaCode(),dto.getWarehouseSid(),sid);
-            if (null != area) {
-                return rb.setMsg("同一个仓库下的库区编码不能重复。");
-            }
+//            WmsWarehouseArea area = baseMapper.checkForUpdate(dto.getAreaCode(),dto.getWarehouseSid(),sid);
+//            if (null != area) {
+//                return rb.setMsg("同一个仓库下的库区编码不能重复。");
+//            }
             WmsWarehouseArea wmsWarehouseArea = fetchBySid(dto.getSid());
             BeanUtil.copyProperties(dto, wmsWarehouseArea, "id", "sid");
             wmsWarehouseArea.setModifyTime(new Date());
             baseMapper.updateById(wmsWarehouseArea);
         } else {
-            WmsWarehouseArea area = baseMapper.checkForInsert(dto.getAreaCode(),dto.getWarehouseSid());
-            if (null != area) {
-                return rb.setMsg("同一个仓库下的库区编码不能重复。");
-            }
+//            WmsWarehouseArea area = baseMapper.checkForInsert(dto.getAreaCode(),dto.getWarehouseSid());
+//            if (null != area) {
+//                return rb.setMsg("同一个仓库下的库区编码不能重复。");
+//            }
+            String warehouseSid = dto.getWarehouseSid();
             WmsWarehouseArea wmsWarehouseArea = new WmsWarehouseArea();
             sid = wmsWarehouseArea.getSid();
             BeanUtil.copyProperties(dto, wmsWarehouseArea, "id", "sid");
             wmsWarehouseArea.setCreateTime(new DateTime());
             wmsWarehouseArea.setCreateBySid(dto.getUserSid());
             wmsWarehouseArea.setIsEnable(1);
+            WmsWarehouseInfo warehouseInfo = warehouseInfoService.fetchBySid(warehouseSid);
+            if (null != warehouseInfo) {
+                String warehouseCode = warehouseInfo.getWarehouseCode();
+                int i = baseMapper.selectNum(warehouseCode);
+                String code = Rule.getBillNo3(warehouseCode, i);
+                wmsWarehouseArea.setAreaCode(code);
+            }
             baseMapper.insert(wmsWarehouseArea);
         }
         return rb.success().setMsg("成功");

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/MangerVo.java

@@ -0,0 +1,15 @@
+package com.yxt.wms.biz.base.wmswarehouseinfo;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/10 17:08
+ */
+@Data
+public class MangerVo {
+
+    private String name;
+    private String sid;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoDto.java

@@ -22,9 +22,9 @@ public class WmsWarehouseInfoDto implements Dto {
     private String isEnable;
     private String warehouseName;//仓库名称
     private String warehouseCode;//仓库编码
-    private String contacts;//联系人
-    private String mob;//手机
-    private String telephone;//联系电话
+//    private String contacts;//联系人
+//    private String mob;//手机
+//    private String telephone;//联系电话
     private String manager;//主管
     private String areaSid;//地区sid
     private String address;//地址

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.java

@@ -31,4 +31,6 @@ public interface WmsWarehouseInfoMapper extends BaseMapper<WmsWarehouseInfo> {
 
     @Select("select * from wms_warehouse_info where useOrgSid =#{useOrgSid} and isDelete = 0 and usageStatus = '1' ")
     List<WmsWarehouseInfo> listAll(@Param("useOrgSid") String useOrgSid);
+
+    int selectNum(@Param("billCode") String billCode);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.xml

@@ -21,6 +21,11 @@
     <select id="checkCodeForUpdate" resultType="com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfo">
         select * from wms_warehouse_info where warehouseCode =#{warehouseCode} and useOrgSid = #{useOrgSid} and sid != #{sid} and isDelete=0
     </select>
+    <select id="selectNum" resultType="java.lang.Integer">
+        select IFNULL(CAST(REPLACE(MAX(warehouseCode), #{billCode}, '') AS SIGNED), 0) as code
+        from wms_warehouse_info
+        where warehouseCode LIKE concat(#{billCode}, '%')
+    </select>
     <update id="updateBySidIsDelete">
         UPDATE wms_warehouse_info
         SET isDelete=1

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java

@@ -17,9 +17,14 @@ import com.yxt.wms.biz.base.wmswarehouseextend.WmsWarehouseExtendVo;
 import com.yxt.wms.feign.portal.privilege.PrivilegeQuery;
 import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign;
 import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo;
+import com.yxt.wms.feign.portal.sysstaffinfo.RoleCodeListQuery;
+import com.yxt.wms.feign.portal.sysstaffinfo.StaffByRole;
+import com.yxt.wms.feign.portal.sysstaffinfo.SysStaffinfoFeign;
 import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign;
 import com.yxt.wms.feign.portal.sysuser.SysUserFeign;
+import com.yxt.wms.utils.BillNo;
 import com.yxt.wms.utils.OrgPathQuery;
+import com.yxt.wms.utils.Rule;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -45,6 +50,8 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
     private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private SysStaffinfoFeign sysStaffinfoFeign;
 
     public ResultBean<PagerVo<WmsWarehouseInfoVo>> listPage(PagerQuery<WmsWarehouseInfoQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
@@ -131,18 +138,7 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
             WmsWarehouseInfo wmsWarehouse = fetchBySid(dto.getSid());
             BeanUtil.copyProperties(dto, wmsWarehouse, "id", "sid");
             wmsWarehouse.setModifyTime(new Date());
-            WmsWarehouseInfo warehouseInfo = baseMapper.checkCodeForUpdate(dto.getWarehouseCode(), wmsWarehouse.getUseOrgSid(), sid);
-            if (warehouseInfo != null) {
-                return rb.setMsg("仓库编码重复");
-            }
             baseMapper.updateById(wmsWarehouse);
-//            for (WmsWarehouseExtendDto wmsWarehouseExtendDto : dto.getWmsWarehouseExtendDtos()) {
-//                wmsWarehouseExtendDto.setWarehouseSid(wmsWarehouse.getSid());
-//            }
-//            if(dto.getWmsWarehouseExtendDto()!=null){
-//                dto.getWmsWarehouseExtendDto().setWarehouseSid(wmsWarehouse.getSid());
-//                wmsWarehouseExtendService.saveOrUpdate(dto.getWmsWarehouseExtendDto());
-//            }
         } else {
             WmsWarehouseInfo wmsWarehouse = new WmsWarehouseInfo();
             sid = wmsWarehouse.getSid();
@@ -152,6 +148,8 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
             String deptName = "";
             String deptSid = "";
             String createOrgSid = "";
+            String deptNo = "";
+            String useOrgNo = "";
             if (StringUtils.isNotBlank(orgPath)) {
                 List<String> split = Arrays.asList(orgPath.split("/"));
                 if (split.size() > 1) {
@@ -161,11 +159,13 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
                     deptName = sysOrganization.getName() + "/" + sysOrganization1.getName();
                     deptName = sysOrganization1.getName();
                     deptSid = sysOrganization1.getSid();
+                    deptNo = sysOrganization1.getOrgCode();
                 } else {
                     SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
                     deptName = sysOrganization.getName();
                     deptName = sysOrganization.getName();
                     deptSid = sysOrganization.getSid();
+                    deptNo = sysOrganization.getOrgCode();
                 }
                 wmsWarehouse.setUseOrgSid(deptSid);
                 createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
@@ -173,26 +173,31 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
                 ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid);
                 if (organizationResultBean.getData() != null) {
                     wmsWarehouse.setCreateOrgSid(createOrgSid);
+                    useOrgNo = organizationResultBean.getData().getOrgCode();
                 }
-            }
-            WmsWarehouseInfo warehouseInfo = baseMapper.checkCode(dto.getWarehouseCode(), deptSid);
-            if (warehouseInfo != null) {
-                return rb.setMsg("仓库编码重复");
+                //生成编码
+                String billCode = useOrgNo + deptNo;
+                String applyCode = getApplyCode(billCode);
+                wmsWarehouse.setWarehouseCode(applyCode);
             }
             baseMapper.insert(wmsWarehouse);
-//            for (WmsWarehouseExtendDto wmsWarehouseExtendDto : dto.getWmsWarehouseExtendDtos()) {
-//                wmsWarehouseExtendDto.setWarehouseSid(wmsWarehouse.getSid());
-//            }
-//            if(dto.getWmsWarehouseExtendDto()!=null){
-//                dto.getWmsWarehouseExtendDto().setWarehouseSid(wmsWarehouse.getSid());
-//                wmsWarehouseExtendService.saveOrUpdate(dto.getWmsWarehouseExtendDto());
-//            }
-
         }
 
         return rb.success().setMsg("成功");
     }
 
+    /**
+     * 生成单据编号
+     *
+     * @param billCode
+     * @return
+     */
+    public String getApplyCode(String billCode) {
+        int i = baseMapper.selectNum(billCode);
+        String billNo = Rule.getBillNo3(billCode, i);
+        return billNo;
+    }
+
     public ResultBean<WmsWarehouseInfoVo> initialization(String sid) {
         ResultBean rb = ResultBean.fireFail();
         WmsWarehouseInfoVo vo = new WmsWarehouseInfoVo();
@@ -237,4 +242,24 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
     public List<WmsWarehouseAreaAllVo> selectAll() {
         return baseMapper.selectAll();
     }
+
+    public List<MangerVo> selMangerByRole(String createOrgSid) {
+        RoleCodeListQuery query = new RoleCodeListQuery();
+        List<String> roleCode = new ArrayList<>();
+        List<MangerVo> list = new ArrayList<>();
+        roleCode.add("74");
+        roleCode.add("75");
+        roleCode.add("76");
+        query.setCreateOrgSid(createOrgSid);
+        List<StaffByRole> data = sysStaffinfoFeign.getStaffNameByRoleCode(query).getData();
+        if (!data.isEmpty()) {
+            for (StaffByRole datum : data) {
+                MangerVo vo = new MangerVo();
+                vo.setName(datum.getManager());
+                vo.setSid(datum.getManagerSid());
+                list.add(vo);
+            }
+        }
+        return list;
+    }
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoVo.java

@@ -28,9 +28,9 @@ public class WmsWarehouseInfoVo implements Vo {
     private String isDelete;
     private String warehouseName;//仓库名称
     private String warehouseCode;//仓库编码
-    private String contacts;//联系人
-    private String mob;//手机
-    private String telephone;//联系电话
+//    private String contacts;//联系人
+//    private String mob;//手机
+//    private String telephone;//联系电话
     private String manager;//主管
     private String areaSid;//地区sid
     private String address;//地址

yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysstaffinfo/RoleCodeListQuery.java

@@ -0,0 +1,20 @@
+package com.yxt.wms.feign.portal.sysstaffinfo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/10 16:53
+ */
+@Data
+public class RoleCodeListQuery {
+    @ApiModelProperty("分公司sid")
+    private String createOrgSid;
+    @ApiModelProperty("角色编码")
+    private List<String> roleCode;
+
+}

yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysstaffinfo/StaffByRole.java

@@ -0,0 +1,17 @@
+package com.yxt.wms.feign.portal.sysstaffinfo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/10 16:50
+ */
+@Data
+public class StaffByRole {
+    @ApiModelProperty("姓名")
+    private String manager;
+    @ApiModelProperty("userSid")
+    private String managerSid;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysstaffinfo/SysStaffinfoFeign.java

@@ -0,0 +1,40 @@
+package com.yxt.wms.feign.portal.sysstaffinfo;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysStaffinfoFeign.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoFeign <br/>
+ * Description: 人员基础信息表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "人员基础信息表")
+@FeignClient(
+        contextId = "anrui-portal-SysStaffinfo",
+        name = "anrui-portal",
+        path = "v1/sysstaffinfo"
+        )
+public interface SysStaffinfoFeign {
+
+    @ApiOperation("根据角色编码获取分公司下人员")
+    @PostMapping("/getStaffNameByRole")
+    public ResultBean<List<StaffByRole>> getStaffNameByRoleCode(@RequestBody RoleCodeListQuery query);
+}

yxt-wms-biz/src/main/java/com/yxt/wms/utils/Rule.java

@@ -27,4 +27,10 @@ public class Rule {
         bill = bill + date;
         return bill;
     }
+
+    public static String getBillNo3(String bill, int i) {
+        String num = String.format("%03d", i + 1); // 不足4位补0
+        String billNo = bill + num;
+        return billNo;
+    }
 }