新增仓库 新增库区 新增缓冲区库位

skyouc

昨天 bb2ba875a4c7ed5f0c31a216862c5fd4cbf88c6e

新增仓库
新增库区
新增缓冲区库位

 src/main/java/com/zy/asrs/controller/BasWhsController.java

@@ -5,8 +5,8 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.zy.asrs.entity.BasWhs;
import com.zy.asrs.service.BasWhsService;
import com.zy.asrs.entity.BasWhsType;
import com.zy.asrs.service.BasWhsTypeService;
import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
@@ -22,12 +22,12 @@
public class BasWhsController extends BaseController {

    @Autowired
    private BasWhsService basWhsService;
    private BasWhsTypeService basWhsTypeService;

    @RequestMapping(value = "/basWhs/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") Long id) {
        return R.ok(basWhsService.selectById(String.valueOf(id)));
        return R.ok(basWhsTypeService.selectById(String.valueOf(id)));
    }

    @RequestMapping(value = "/basWhs/list/auth")
@@ -38,10 +38,10 @@
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
        excludeTrash(param);
        EntityWrapper<BasWhs> wrapper = new EntityWrapper<>();
        EntityWrapper<BasWhsType> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(basWhsService.selectPage(new Page<>(curr, limit), wrapper));
        return R.ok(basWhsTypeService.selectPage(new Page<>(curr, limit), wrapper));
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
@@ -59,36 +59,36 @@

    @RequestMapping(value = "/basWhs/add/auth")
    @ManagerAuth(memo = "库位类型添加")
    public R add(BasWhs basWhs) {
        basWhs.setModiUser(getUserId());
        basWhs.setModiTime(new Date());
        basWhs.setAppeUser(getUserId());
        basWhs.setAppeTime(new Date());
        basWhsService.insert(basWhs);
    public R add(BasWhsType basWhsType) {
        basWhsType.setModiUser(getUserId());
        basWhsType.setModiTime(new Date());
        basWhsType.setAppeUser(getUserId());
        basWhsType.setAppeTime(new Date());
        basWhsTypeService.insert(basWhsType);
        return R.ok();
    }

    @RequestMapping(value = "/basWhs/update/auth")
    @ManagerAuth(memo = "库位类型修改")
    public R update(BasWhs basWhs){
        if (Cools.isEmpty(basWhs) || null==basWhs.getId()){
    public R update(BasWhsType basWhsType){
        if (Cools.isEmpty(basWhsType) || null== basWhsType.getId()){
            return R.error();
        }
        basWhs.setModiUser(getUserId());
        basWhs.setModiTime(new Date());
        basWhsService.updateById(basWhs);
        basWhsType.setModiUser(getUserId());
        basWhsType.setModiTime(new Date());
        basWhsTypeService.updateById(basWhsType);
        return R.ok();
    }

    @RequestMapping(value = "/basWhs/delete/auth")
    @ManagerAuth(memo = "库位类型删除")
    public R delete(@RequestParam String param){
        List<BasWhs> list = JSONArray.parseArray(param, BasWhs.class);
        List<BasWhsType> list = JSONArray.parseArray(param, BasWhsType.class);
        if (Cools.isEmpty(list)){
            return R.error();
        }
        for (BasWhs entity : list){
            basWhsService.delete(new EntityWrapper<>(entity));
        for (BasWhsType entity : list){
            basWhsTypeService.delete(new EntityWrapper<>(entity));
        }
        return R.ok();
    }
@@ -97,24 +97,24 @@
    @ManagerAuth(memo = "库位类型导出")
    public R export(@RequestBody JSONObject param){
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        EntityWrapper<BasWhs> wrapper = new EntityWrapper<>();
        EntityWrapper<BasWhsType> wrapper = new EntityWrapper<>();
        Map<String, Object> map = excludeTrash(param.getJSONObject("basWhs"));
        convert(map, wrapper);
        List<BasWhs> list = basWhsService.selectList(wrapper);
        List<BasWhsType> list = basWhsTypeService.selectList(wrapper);
        return R.ok(exportSupport(list, fields));
    }

    @RequestMapping(value = "/basWhsQuery/auth")
    @ManagerAuth
    public R query(String condition) {
        EntityWrapper<BasWhs> wrapper = new EntityWrapper<>();
        EntityWrapper<BasWhsType> wrapper = new EntityWrapper<>();
        wrapper.like("whs_desc", condition);
        Page<BasWhs> page = basWhsService.selectPage(new Page<>(0, 10), wrapper);
        Page<BasWhsType> page = basWhsTypeService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (BasWhs basWhs : page.getRecords()){
        for (BasWhsType basWhsType : page.getRecords()){
            Map<String, Object> map = new HashMap<>();
            map.put("id", basWhs.getId());
            map.put("value", basWhs.getWhsDesc());
            map.put("id", basWhsType.getId());
            map.put("value", basWhsType.getWhsDesc());
            result.add(map);
        }
        return R.ok(result);
@@ -123,9 +123,9 @@
    @RequestMapping(value = "/basWhs/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<BasWhs> wrapper = new EntityWrapper<BasWhs>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != basWhsService.selectOne(wrapper)){
            return R.parse(BaseRes.REPEAT).add(getComment(BasWhs.class, String.valueOf(param.get("key"))));
        Wrapper<BasWhsType> wrapper = new EntityWrapper<BasWhsType>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != basWhsTypeService.selectOne(wrapper)){
            return R.parse(BaseRes.REPEAT).add(getComment(BasWhsType.class, String.valueOf(param.get("key"))));
        }
        return R.ok();
    }

 src/main/java/com/zy/asrs/controller/LocMastController.java

@@ -33,23 +33,17 @@
    @Autowired
    private LocDetlService locDetlService;
    @Autowired
    private BasWhsService basWhsService;

    private BasWhsTypeService basWhsTypeService;
    @Resource
    private WrkMastService wrkMastService;

    @Resource
    private AdjDetlService adjDetlService;

    @Resource
    private LocDetlMapper locDetlMapper;

    @Resource
    private CommonService commonService;

    @Resource
    private WrkMastLogService wrkMastLogService;

    @Resource
    private WrkDetlLogService wrkDetlLogService;

@@ -75,37 +69,39 @@

    @RequestMapping(value = "/locMast/list/auth")
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
    public R list(@RequestParam(defaultValue = "1") Integer curr,
                  @RequestParam(defaultValue = "10") Integer limit,
                  @RequestParam(required = false) String orderByField,
                  @RequestParam(required = false) String orderByType,
                  @RequestParam Map<String, Object> param) {
        excludeTrash(param);
        EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
        boolean sign = false;
        for (Map.Entry<String, Object> entry : map.entrySet()){
        for (Map.Entry<String, Object> entry : map.entrySet()) {
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)){
            if (val.contains(RANGE_TIME_LINK)) {
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else if (entry.getKey().equals("loc_no")){
            } else if (entry.getKey().equals("loc_no")) {
                wrapper.like(entry.getKey(), val);
            } else {
                if (entry.getKey().equals("loc_type1")){
                    sign=true;
                if (entry.getKey().equals("loc_type1")) {
                    sign = true;
                }
                wrapper.eq(entry.getKey(), val);
            }
        }
        if (sign){
            wrapper.and().ne("loc_sts","Y");
        if (sign) {
            wrapper.and().ne("loc_sts", "Y");
        }
    }

@@ -120,19 +116,19 @@
        return R.ok();
    }

    @RequestMapping(value = "/locMast/update/auth")
    @ManagerAuth(memo = "库位修改")
    public R update(LocMast locMast){
    @RequestMapping(value = "/locMast/update/auth")
    @ManagerAuth(memo = "库位修改")
    public R update(LocMast locMast) {

        if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
        if (Cools.isEmpty(locMast) || null == locMast.getLocNo()) {
            return R.error();
        }

        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                .eq("source_loc_no", locMast.getLocNo())
                .or().eq("loc_no", locMast.getLocNo()));
        if(!Cools.isEmpty(wrkMast)){
            return  R.error("该库位正在作业，请先处理工作档");
        if (!Cools.isEmpty(wrkMast)) {
            return R.error("该库位正在作业，请先处理工作档");
        }

        LocMast oldLocMast = locMastService.selectById(locMast.getLocNo());
@@ -220,7 +216,7 @@
        if (locMast.getFrozen() == 1 && oldLocMast.getFrozen() == 0 && locMast.getLocSts().equals("F") && oldLocMast.getLocSts().equals("F")) {
            locDetlMapper.updateDetlFrozenByLocNo(oldLocMast.getLocNo());
        }
        if(!locMastService.updateById(locMast)) {
        if (!locMastService.updateById(locMast)) {
            throw new CoolException("服务器错误，请联系管理员");
        }
        return R.ok();
@@ -228,12 +224,12 @@

    @RequestMapping(value = "/locMast/delete/auth")
    @ManagerAuth(memo = "库位删除")
    public R delete(@RequestParam String param){
    public R delete(@RequestParam String param) {
        List<LocMast> list = JSONArray.parseArray(param, LocMast.class);
        if (Cools.isEmpty(list)){
        if (Cools.isEmpty(list)) {
            return R.error();
        }
        for (LocMast entity : list){
        for (LocMast entity : list) {
            locMastService.delete(new EntityWrapper<>(entity));
        }
        return R.ok();
@@ -241,7 +237,7 @@

    @RequestMapping(value = "/locMast/export/auth")
    @ManagerAuth(memo = "库位导出")
    public R export(@RequestBody JSONObject param){
    public R export(@RequestBody JSONObject param) {
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
        Map<String, Object> map = excludeTrash(param.getJSONObject("locMast"));
@@ -257,7 +253,7 @@
        wrapper.like("loc_no", condition);
        Page<LocMast> page = locMastService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (LocMast locMast : page.getRecords()){
        for (LocMast locMast : page.getRecords()) {
            Map<String, Object> map = new HashMap<>();
            map.put("id", locMast.getLocNo());
            map.put("value", locMast.getLocNo());
@@ -270,7 +266,7 @@
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<LocMast> wrapper = new EntityWrapper<LocMast>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != locMastService.selectOne(wrapper)){
        if (null != locMastService.selectOne(wrapper)) {
            return R.parse(BaseRes.REPEAT).add(getComment(LocMast.class, String.valueOf(param.get("key"))));
        }
        return R.ok();
@@ -280,38 +276,36 @@
    @ManagerAuth(memo = "初始化库位")
//    @Transactional
    public R init(LocMastInitParam param) {
        try{
        try {
            List<LocMast> list = new ArrayList<>();
            BasWhs basWhs = basWhsService.selectByIdentifying(param.getIdentifying());
            if (Cools.isEmpty(basWhs)){
            BasWhsType basWhsType = basWhsTypeService.selectByIdentifying(param.getIdentifying());
            if (Cools.isEmpty(basWhsType)) {
                return R.error("库型不存在！！！");
            }
            for (int r=param.getStartRow(); r<=param.getEndRow(); r++){
                for (int b=param.getStartBay(); b<=param.getEndBay(); b++) {
                    for (int l=param.getStartLev(); l<=param.getEndLev(); l++) {
            for (int r = param.getStartRow(); r <= param.getEndRow(); r++) {
                for (int b = param.getStartBay(); b <= param.getEndBay(); b++) {
                    for (int l = param.getStartLev(); l <= param.getEndLev(); l++) {
                        // 获取库位号
                        String locNo = String.format("%02d", r) + String.format("%03d", b) + String.format("%02d", l);
                        // 获取堆垛机号
                        int crnNo = 0;
                        try{
                            Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getCrnAmount(),param.getStartRow());
                            for (List<Integer> node : shelves.nodes){

                        try {
                            Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getCrnAmount(), param.getStartRow());
                            for (List<Integer> node : shelves.nodes) {
                                if (node.contains(r)) {
                                    if (!Cools.isEmpty(param.getStaCrn()) && param.getStaCrn() > 0){
                                    if (!Cools.isEmpty(param.getStaCrn()) && param.getStaCrn() > 0) {
                                        crnNo = shelves.nodes.indexOf(node) + param.getStaCrn();
                                    }else {
                                    } else {
                                        crnNo = shelves.nodes.indexOf(node) + 1;
                                    }

                                    break;
                                }
                            }
                        }catch (Exception e){
                        } catch (Exception e) {
                            throw new Exception("解析堆垛机号失败，请填写正确的数据!!!");
                        }

                        Date now =  new Date();
                        Date now = new Date();
                        LocMast locMast = new LocMast();
                        locMast.setLocNo(locNo);
                        locMast.setLocSts("O");
@@ -327,18 +321,18 @@
                        locMast.setAppeTime(now);
                        locMast.setModiUser(getUserId());
                        locMast.setModiTime(now);
                        locMast.setWhsType(basWhs.getId());
                        locMast.setWhsType(basWhsType.getId());
                        list.add(locMast);
                    }
                }
            }
            if (!Cools.isEmpty(param.getEnable()) && param.getEnable() == 1){
            if (!Cools.isEmpty(param.getEnable()) && param.getEnable() == 1) {
                locMastService.delete(new EntityWrapper<>());
            }
            locMastService.insertBatch(list);
            return R.ok("初始化成功");
        }catch (Exception e){
            return R.error("初始化失败===>"+e.getMessage());
        } catch (Exception e) {
            return R.error("初始化失败===>" + e.getMessage());
        }
    }
}

 src/main/java/com/zy/asrs/entity/BasWhsType.java

File was renamed from src/main/java/com/zy/asrs/entity/BasWhs.java
@@ -14,8 +14,8 @@
import java.text.SimpleDateFormat;
import java.util.Date;

@TableName("asr_bas_whs")
public class BasWhs implements Serializable {
@TableName("asr_bas_whs_type")
public class BasWhsType implements Serializable {

    private static final long serialVersionUID = 1L;

@@ -67,9 +67,9 @@
    @ApiModelProperty(value= "标识")
    private String identifying;

    public BasWhs() {}
    public BasWhsType() {}

    public BasWhs(String whsDesc,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
    public BasWhsType(String whsDesc, Long modiUser, Date modiTime, Long appeUser, Date appeTime) {
        this.whsDesc = whsDesc;
        this.modiUser = modiUser;
        this.modiTime = modiTime;

 src/main/java/com/zy/asrs/entity/LocMast.java

@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.zy.asrs.service.BasLocStsService;
import com.zy.asrs.service.BasWhsService;
import com.zy.asrs.service.BasWhsTypeService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import com.core.common.Cools;
@@ -197,10 +197,10 @@


    public String getWhsType$(){
        BasWhsService service = SpringUtils.getBean(BasWhsService.class);
        BasWhs basWhs = service.selectById(this.whsType);
        if (!Cools.isEmpty(basWhs)){
            return String.valueOf(basWhs.getWhsDesc());
        BasWhsTypeService service = SpringUtils.getBean(BasWhsTypeService.class);
        BasWhsType basWhsType = service.selectById(this.whsType);
        if (!Cools.isEmpty(basWhsType)){
            return String.valueOf(basWhsType.getWhsDesc());
        }
        return null;
    }

 src/main/java/com/zy/asrs/entity/OrderDetlPakin.java

@@ -20,6 +20,7 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Objects;

@Data
@TableName("man_order_detl_pakin")
@@ -418,6 +419,7 @@
    }

    public String getPakinPakoutStatus$(){
        if (Objects.isNull(pakinPakoutStatus)) {return  null;}
        switch (this.pakinPakoutStatus){
            case 1:
                return "Y";

 src/main/java/com/zy/asrs/entity/RowLastno.java

@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.zy.asrs.service.BasWhsService;
import com.zy.asrs.service.BasWhsTypeService;
import com.zy.asrs.service.RowLastnoTypeService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
@@ -383,10 +383,10 @@
    public String getTypeId$() {
        RowLastnoTypeService rowLastnoTypeService = SpringUtils.getBean(RowLastnoTypeService.class);
        RowLastnoType rowLastnoType = rowLastnoTypeService.selectById(this.typeId.longValue());
        BasWhsService basWhsService = SpringUtils.getBean(BasWhsService.class);
        BasWhs basWhs = basWhsService.selectById(rowLastnoType.getType().longValue());
        BasWhsTypeService basWhsTypeService = SpringUtils.getBean(BasWhsTypeService.class);
        BasWhsType basWhsType = basWhsTypeService.selectById(rowLastnoType.getType().longValue());
        if (!Cools.isEmpty(rowLastnoType)){
            return rowLastnoType.getTypeName()+"<==>"+rowLastnoType.getMemo()+"<==>"+basWhs.getWhsDesc();
            return rowLastnoType.getTypeName()+"<==>"+rowLastnoType.getMemo()+"<==>"+ basWhsType.getWhsDesc();
        }
        return typeId.toString();
    }

 src/main/java/com/zy/asrs/mapper/BasWhsMapper.java

@@ -1,15 +1,15 @@
package com.zy.asrs.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.BasWhs;
import com.zy.asrs.entity.BasWhsType;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

@Mapper
@Repository
public interface BasWhsMapper extends BaseMapper<BasWhs> {
public interface BasWhsMapper extends BaseMapper<BasWhsType> {

    BasWhs selectByIdentifying(@Param("identifying") String identifying);
    BasWhsType selectByIdentifying(@Param("identifying") String identifying);

}

 src/main/java/com/zy/asrs/service/BasWhsService.java

File was deleted

 src/main/java/com/zy/asrs/service/BasWhsTypeService.java

New file
@@ -0,0 +1,8 @@
package com.zy.asrs.service;

import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.BasWhsType;

public interface BasWhsTypeService extends IService<BasWhsType> {
    BasWhsType selectByIdentifying(String Identifying);
}

 src/main/java/com/zy/asrs/service/impl/BasWhsServiceImpl.java

File was deleted

 src/main/java/com/zy/asrs/service/impl/BasWhsTypeServiceImpl.java

New file
@@ -0,0 +1,15 @@
package com.zy.asrs.service.impl;

import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.BasWhsType;
import com.zy.asrs.mapper.BasWhsMapper;
import com.zy.asrs.service.BasWhsTypeService;
import org.springframework.stereotype.Service;

@Service("basWhsService")
public class BasWhsTypeServiceImpl extends ServiceImpl<BasWhsMapper, BasWhsType> implements BasWhsTypeService {
    @Override
    public BasWhsType selectByIdentifying(String identifying) {
        return this.baseMapper.selectByIdentifying(identifying);
    }
}

 src/main/java/com/zy/common/CodeBuilder.java

@@ -17,10 +17,10 @@
//        generator.table="sys_host";
        // sqlserver
        generator.sqlOsType = SqlOsType.SQL_SERVER;
        generator.url="127.0.0.1:1433;databasename=source";
        generator.url="127.0.0.1:1433;databasename=jsxswms";
        generator.username="sa";
        generator.password="sa@123";
        generator.table="asr_app_version";
        generator.password="Skyouc#23";
        generator.table="asr_bas_whs";
        generator.packagePath="com.zy.asrs";
        generator.build();
    }

 src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  port: 8081
  port: 8080
  servlet:
    context-path: /@pom.build.finalName@

@@ -22,9 +22,10 @@
#    url: jdbc:sqlserver://192.168.4.191:50948;databasename=source
#    username: sa
#    password: sa@123
    url: jdbc:sqlserver://127.0.0.1:62316;databasename=source
#    url: jdbc:sqlserver://127.0.0.1:62316;databasename=source
    username: sa
    password: sa@123
    password: Skyouc#23
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=jsxswms
  mvc:
    static-path-pattern: /**
  redis:
@@ -39,9 +40,13 @@

mybatis-plus:
  mapper-locations: classpath:mapper/*.xml

  #  global-config:
  #    field-strategy: 0
  configuration:
    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
logging:
  path: /stock/out/@pom.build.finalName@/logs
  file:
    path: /stock/out/@pom.build.finalName@/logs

super:
  pwd: asrs2023

 src/main/resources/mapper/BasWhsMapper.xml

@@ -3,7 +3,7 @@
<mapper namespace="com.zy.asrs.mapper.BasWhsMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasWhs">
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasWhsType">
        <id column="id" property="id" />
        <result column="whs_desc" property="whsDesc" />
        <result column="modi_user" property="modiUser" />
@@ -16,7 +16,7 @@

    <select id="selectByIdentifying" resultMap="BaseResultMap">
        select top 1 *
        from asr_bas_whs
        from asr_bas_whs_type
        where 1=1
        and identifying = #{identifying}
    </select>

 src/main/webapp/static/js/cool.js

@@ -1,9 +1,9 @@
/**
 * 搜索自动补全 -- 局外点击隐藏
 */
$(function(){
    $(document).on("click",function(e){
        if(!$(e.target).parents(".cool-auto-complete").length){
$(function () {
    $(document).on("click", function (e) {
        if (!$(e.target).parents(".cool-auto-complete").length) {
            $(".cool-auto-complete-window").hide();
        }
    });
@@ -16,12 +16,12 @@
function autoShow(id) {
    var cac = document.getElementById(id).parentNode;
    var cacw = cac.getElementsByClassName("cool-auto-complete-window")[0];
    if (cacw.style.display === "none" || cacw.style.display === ""){
    if (cacw.style.display === "none" || cacw.style.display === "") {
        cacw.style.display = "block";
        var cacwi = cacw.getElementsByClassName("cool-auto-complete-window-input")[0];
        cacwi.focus();
        autoLoad(cacwi.getAttribute('data-key'));
    }else {
    } else {
        cacw.style.display = "none";
    }
}
@@ -30,30 +30,30 @@
 * 搜索自动补全 -- input
 */
function autoLoad(val) {
    var inputDomVal = document.querySelector("input[data-key="+val+"]").value;
    var selectDom = document.querySelector("select[data-key="+val+"Select]");
    var inputDomVal = document.querySelector("input[data-key=" + val + "]").value;
    var selectDom = document.querySelector("select[data-key=" + val + "Select]");
    selectDom.length = 0;
    var defaultOption = new Option("取消选择", "");
    defaultOption.title = "";
    selectDom.appendChild(defaultOption);
    selectDom.style.display='none';
    selectDom.style.display = 'none';
    $.ajax({
        url: baseUrl+"/"+getForeignKeyQuery(val)+"/auth",
        url: baseUrl + "/" + getForeignKeyQuery(val) + "/auth",
        headers: {'token': localStorage.getItem('token')},
        data: {condition: inputDomVal},
        method: 'POST',
        traditional:true,
        traditional: true,
        success: function (res) {
            if (res.code === 200){
            if (res.code === 200) {
                var list = res.data;
                for (var i=0;i<list.length;i++){
                for (var i = 0; i < list.length; i++) {
                    var option = new Option(list[i].value, i);
                    option.title = list[i].id;
                    selectDom.options[i+1] = option;
                    selectDom.options[i + 1] = option;
                }
                selectDom.style.display='block';
            } else if (res.code === 403){
                top.location.href = baseUrl+"/";
                selectDom.style.display = 'block';
            } else if (res.code === 403) {
                top.location.href = baseUrl + "/";
            } else {
                layer.msg(res.msg)
            }
@@ -64,13 +64,13 @@
/**
 * 搜索自动补全 -- select
 */
function confirmed(val){
    var inputDom = $("input[data-key="+val.substring(0,val.length - 6)+"]");
    var selectDom = $("select[data-key="+val+"]");

    selectDom.dblclick(function(){
function confirmed(val) {
    var inputDom = $("input[data-key=" + val.substring(0, val.length - 6) + "]");
    var selectDom = $("select[data-key=" + val + "]");
    console.log(val.substring(0, val.length - 6))
    selectDom.dblclick(function () {
        inputDom.focus();
        selectDom.css("display","none");
        selectDom.css("display", "none");
    });

    // 修饰字段
@@ -81,7 +81,7 @@
    // id字段
    var selectOptionDom = selectDom.find("option:selected");
    var html = selectOptionDom.html();
    if (html === "取消选择"){
    if (html === "取消选择") {
        cacd.val("");
        realDom.val("");
    } else {
@@ -92,7 +92,7 @@
}

function reviewImg(src) {
    window.open().document.write("<img src="+src+" />");
    window.open().document.write("<img src=" + src + " />");
}

/**
@@ -100,9 +100,10 @@
 */
function getForeignKeyQuery(str) {
    var index = str.indexOf('By');
    if (index !== -1){
    if (index !== -1) {
        return str.substring(0, index);
    }

    return str;
}

@@ -116,36 +117,37 @@

var banMsg;
var tips;

// 主键校验
function check(id, domain) {
    var param = {
        key: id,
        val: $('#'+id).val()
        val: $('#' + id).val()
    };
    $.ajax({
        url: baseUrl+"/"+domain+"/check/column/auth",
        url: baseUrl + "/" + domain + "/check/column/auth",
        headers: {'token': localStorage.getItem('token')},
        data: JSON.stringify(param),
        dataType:'json',
        contentType:'application/json;charset=UTF-8',
        dataType: 'json',
        contentType: 'application/json;charset=UTF-8',
        method: 'POST',
        success: function (res) {
            if (res.code === 200) {
                layer.close(tips);
                banMsg = null;
            } else if (res.code === 403) {
                top.location.href = baseUrl+"/";
                top.location.href = baseUrl + "/";
            } else if (res.code === 407) {
                banMsg = res.data + "不可用";
                tips = layer.tips(
                    "<span style='color:red;'>已存在</span>",
                    '#'+id,
                    '#' + id,
                    {
                        // tipsMore: true,
                        tips: [2,'#fff'],
                        time:0
                        ,area: 'auto'
                        ,maxWidth:500
                        tips: [2, '#fff'],
                        time: 0
                        , area: 'auto'
                        , maxWidth: 500
                    });
            }
        }

 src/main/webapp/views/basWhs/basWhs.html

@@ -31,7 +31,7 @@

<!-- 表格 -->
<div class="layui-form">
    <table class="layui-hide" id="basWhs" lay-filter="basWhs"></table>
    <table class="layui-hide" id="basWhsType" lay-filter="basWhsType"></table>
</div>
<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
@@ -49,7 +49,7 @@
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basWhs/basWhs.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basWhsType/basWhsType.js" charset="utf-8"></script>

<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>


 src/main/webapp/views/basWhs/basWhs_detail.html

@@ -26,7 +26,7 @@
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label"><span class="not-null">*</span>编　　号：</label>
            <div class="layui-input-inline">
                <input id="id" class="layui-input" type="text" onkeyup="check(this.id, 'basWhs')">
                <input id="id" class="layui-input" type="text" onkeyup="check(this.id, 'basWhsType')">
            </div>
        </div>
        <div class="layui-inline"  style="width:80%;">
@@ -91,6 +91,6 @@
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basWhs/basWhs.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basWhsType/basWhsType.js" charset="utf-8"></script>
</html>


 version/bak/lfdasrs_LogBackup_2023-02-02_17-03-48.bak

Binary files differ