自动化立体仓库 - WMS系统
zjj
2023-09-06 914a092bc4c21d69641f94b68fecf61b25ddaca1
#拣货单完成、上架规则
9个文件已添加
12个文件已修改
1039 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/LocRuleController.java 123 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/NodeController.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/OutController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/LocRule.java 203 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/mapper/LocRuleMapper.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/mapper/NodeMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/LocRuleService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/NodeService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/LocRuleServiceImpl.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java 70 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/PakoutServiceImpl.java 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/common/CodeBuilder.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/common/model/LocDto.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/locRule.sql 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/AMap.json 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/LocRuleMapper.xml 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/NodeMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/locRule/locRule.js 272 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/picking/picking.js 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/locRule/locRule.html 217 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/LocRuleController.java
New file
@@ -0,0 +1,123 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.LocRule;
import com.zy.asrs.service.LocRuleService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.*;
@RestController
public class LocRuleController extends BaseController {
    @Autowired
    private LocRuleService locRuleService;
    @RequestMapping(value = "/locRule/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") String id) {
        return R.ok(locRuleService.selectById(String.valueOf(id)));
    }
    @RequestMapping(value = "/locRule/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){
        EntityWrapper<LocRule> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(locRuleService.selectPage(new Page<>(curr, limit), wrapper));
    }
    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            String val = String.valueOf(entry.getValue());
            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 {
                wrapper.like(entry.getKey(), val);
            }
        }
    }
    @RequestMapping(value = "/locRule/add/auth")
    @ManagerAuth
    public R add(LocRule locRule) {
        locRuleService.insert(locRule);
        return R.ok();
    }
    @RequestMapping(value = "/locRule/update/auth")
    @ManagerAuth
    public R update(LocRule locRule){
        if (Cools.isEmpty(locRule) || null==locRule.getId()){
            return R.error();
        }
        locRuleService.updateById(locRule);
        return R.ok();
    }
    @RequestMapping(value = "/locRule/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
            locRuleService.deleteById(id);
        }
        return R.ok();
    }
    @RequestMapping(value = "/locRule/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param){
        EntityWrapper<LocRule> wrapper = new EntityWrapper<>();
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        Map<String, Object> map = excludeTrash(param.getJSONObject("locRule"));
        convert(map, wrapper);
        List<LocRule> list = locRuleService.selectList(wrapper);
        return R.ok(exportSupport(list, fields));
    }
    @RequestMapping(value = "/locRuleQuery/auth")
    @ManagerAuth
    public R query(String condition) {
        EntityWrapper<LocRule> wrapper = new EntityWrapper<>();
        wrapper.like("id", condition);
        Page<LocRule> page = locRuleService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (LocRule locRule : page.getRecords()){
            Map<String, Object> map = new HashMap<>();
            map.put("id", locRule.getId());
            map.put("value", locRule.getId());
            result.add(map);
        }
        return R.ok(result);
    }
    @RequestMapping(value = "/locRule/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<LocRule> wrapper = new EntityWrapper<LocRule>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != locRuleService.selectOne(wrapper)){
            return R.parse(BaseRes.REPEAT).add(getComment(LocRule.class, String.valueOf(param.get("key"))));
        }
        return R.ok();
    }
}
src/main/java/com/zy/asrs/controller/NodeController.java
@@ -352,7 +352,7 @@
        EntityWrapper<Node> nodeEntityWrapper = new EntityWrapper<>();
        nodeEntityWrapper.eq("id",param.getValue());
        nodeEntityWrapper.eq("name",param.getName());
 //       nodeService.delete(new EntityWrapper<Node>().eq("parent_id",param.getValue()));
        nodeService.delete(new EntityWrapper<Node>().eq("parent_id",param.getValue()));
        Node node = nodeService.selectOne(nodeEntityWrapper);
        String[] string = node.getNamePath().split(",");
        int tno=1; int no=1;
@@ -472,6 +472,12 @@
        return R.ok(keyValueVoList);
    }
    @RequestMapping(value = "/node/recommendLoc")
    public R recommendLoc(@RequestParam String matnr){
        List<String> remmendLoc = nodeService.getRemmendLoc(matnr);
        return R.ok(remmendLoc);
    }
src/main/java/com/zy/asrs/controller/OutController.java
@@ -84,7 +84,7 @@
                        sign=true;
                    }
                    LocDto locDto = new LocDto(locDetl.getHostId(),locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
                            sign ? locDetl.getAnfme() : issued);
                            sign ? locDetl.getAnfme() : issued,"平库");
                    List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(),  sign? 101 : 103);
//                    LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
//                            locDetl.getAnfme(), issued < locDetl.getAnfme()? issued : locDetl.getAnfme());
@@ -102,7 +102,7 @@
                }
            }
            if (issued > 0) {
                LocDto locDto = new LocDto(null,null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
                LocDto locDto = new LocDto(null,null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued,"平库");
//                LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), 0.0,issued);
                locDto.setLack(Boolean.TRUE);
                locDtos.add(locDto);
src/main/java/com/zy/asrs/entity/LocRule.java
New file
@@ -0,0 +1,203 @@
package com.zy.asrs.entity;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;
@Data
@TableName("asr_loc_rule")
public class LocRule implements Serializable {
    private static final long serialVersionUID = 1L;
    @ApiModelProperty(value= "")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;
    @ApiModelProperty(value= "")
    private String matnr;
    @ApiModelProperty(value= "")
    private String specs;
    @ApiModelProperty(value= "")
    private String model;
    @ApiModelProperty(value= "")
    private String cstmr;
    @ApiModelProperty(value= "")
    private String batch;
    @ApiModelProperty(value= "")
    private String other;
    @ApiModelProperty(value= "")
    @TableField("row_beg")
    private Integer rowBeg;
    @ApiModelProperty(value= "")
    @TableField("row_end")
    private Integer rowEnd;
    @ApiModelProperty(value= "")
    @TableField("bay_beg")
    private Integer bayBeg;
    @ApiModelProperty(value= "")
    @TableField("bay_end")
    private Integer bayEnd;
    @ApiModelProperty(value= "")
    @TableField("lev_beg")
    private Integer levBeg;
    @ApiModelProperty(value= "")
    @TableField("lev_end")
    private Integer levEnd;
    @ApiModelProperty(value= "")
    private Integer limit;
    @ApiModelProperty(value= "")
    private Integer status;
    @ApiModelProperty(value= "")
    @TableField("create_by")
    private Long createBy;
    @ApiModelProperty(value= "")
    @TableField("create_time")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date createTime;
    @ApiModelProperty(value= "")
    @TableField("update_by")
    private Long updateBy;
    @ApiModelProperty(value= "")
    @TableField("update_time")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date updateTime;
    @ApiModelProperty(value= "")
    private String memo;
    /**
     * 是否支持混载 0: 不支持  1: 支持
     */
    @ApiModelProperty(value= "是否支持混载 0: 不支持  1: 支持  ")
    private Short mixed;
    /**
     * 支持混载情况下,没找到库位是否继续寻找 0: 否  1: 是
     */
    @ApiModelProperty(value= "支持混载情况下,没找到库位是否继续寻找 0: 否  1: 是  ")
    @TableField("keep_go")
    private Short keepGo;
    @ApiModelProperty(value= "")
    private String maktx;
    public LocRule() {}
    public LocRule(String matnr,String specs,String model,String cstmr,String batch,String other,Integer rowBeg,Integer rowEnd,Integer bayBeg,Integer bayEnd,Integer levBeg,Integer levEnd,Integer limit,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Short mixed,Short keepGo,String maktx) {
        this.matnr = matnr;
        this.specs = specs;
        this.model = model;
        this.cstmr = cstmr;
        this.batch = batch;
        this.other = other;
        this.rowBeg = rowBeg;
        this.rowEnd = rowEnd;
        this.bayBeg = bayBeg;
        this.bayEnd = bayEnd;
        this.levBeg = levBeg;
        this.levEnd = levEnd;
        this.limit = limit;
        this.status = status;
        this.createBy = createBy;
        this.createTime = createTime;
        this.updateBy = updateBy;
        this.updateTime = updateTime;
        this.memo = memo;
        this.mixed = mixed;
        this.keepGo = keepGo;
        this.maktx = maktx;
    }
//    LocRule locRule = new LocRule(
//            null,    //
//            null,    //
//            null,    //
//            null,    //
//            null,    //
//            null,    //
//            null,    //
//            null,    //
//            null,    //
//            null,    //
//            null,    //
//            null,    //
//            null,    //
//            null,    //
//            null,    //
//            null,    //
//            null,    //
//            null,    //
//            null,    //
//            null,    // 是否支持混载
//            null,    // 支持混载情况下,没找到库位是否继续寻找
//            null    //
//    );
    public String getCreateTime$(){
        if (Cools.isEmpty(this.createTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
    }
    public String getUpdateTime$(){
        if (Cools.isEmpty(this.updateTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
    }
    public String getMixed$(){
        if (null == this.mixed){ return null; }
        switch (this.mixed){
            case 0:
                return "不支持";
            case 1:
                return "支持";
            default:
                return String.valueOf(this.mixed);
        }
    }
    public String getKeepGo$(){
        if (null == this.keepGo){ return null; }
        switch (this.keepGo){
            case 0:
                return "否";
            case 1:
                return "是";
            default:
                return String.valueOf(this.keepGo);
        }
    }
}
src/main/java/com/zy/asrs/mapper/LocRuleMapper.java
New file
@@ -0,0 +1,12 @@
package com.zy.asrs.mapper;
import com.zy.asrs.entity.LocRule;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@Mapper
@Repository
public interface LocRuleMapper extends BaseMapper<LocRule> {
}
src/main/java/com/zy/asrs/mapper/NodeMapper.java
@@ -18,4 +18,6 @@
    List<Node> listByPage(Map<String, Object> map);
    Integer listByPageCount(Map<String, Object> map);
    List<String> getRommendLoc(@Param("matnr") String matnr);
}
src/main/java/com/zy/asrs/service/LocRuleService.java
New file
@@ -0,0 +1,8 @@
package com.zy.asrs.service;
import com.zy.asrs.entity.LocRule;
import com.baomidou.mybatisplus.service.IService;
public interface LocRuleService extends IService<LocRule> {
}
src/main/java/com/zy/asrs/service/NodeService.java
@@ -30,4 +30,6 @@
    void locMove(String sourceLocNo, String targetLocNo, Long userId,User user);
    Page<Node> getPage(Page<Node> page);
    List<String> getRemmendLoc(String matnr);
}
src/main/java/com/zy/asrs/service/impl/LocRuleServiceImpl.java
New file
@@ -0,0 +1,12 @@
package com.zy.asrs.service.impl;
import com.zy.asrs.mapper.LocRuleMapper;
import com.zy.asrs.entity.LocRule;
import com.zy.asrs.service.LocRuleService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@Service("locRuleService")
public class LocRuleServiceImpl extends ServiceImpl<LocRuleMapper, LocRule> implements LocRuleService {
}
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -535,21 +535,21 @@
        Node node = nodeService.selectOne(new EntityWrapper<Node>()
                .eq("name", jsonLocNo));
        if (node.getParentName().equals("A") || node.getParentName().equals("B")){
            if (node.getRow1() == 1 && locDetls.size() >=11){
                return R.error("该库位排已满");
            }
            if (node.getRow1() == 6 && locDetls.size() >=4){
                return R.error("该库位排已满");
            }
            if (node.getRow1() == 12 && locDetls.size() >=4){
                return R.error("该库位排已满");
            }
        }
        if (locDetls.size() >=12){
            return R.error("该库位排已满");
        }
//        if (node.getParentName().equals("A") || node.getParentName().equals("B")){
//            if (node.getRow1() == 1 && locDetls.size() >=11){
//                return R.error("该库位排已满");
//            }
//            if (node.getRow1() == 6 && locDetls.size() >=4){
//                return R.error("该库位排已满");
//            }
//            if (node.getRow1() == 12 && locDetls.size() >=4){
//                return R.error("该库位排已满");
//            }
//
//        }
//        if (locDetls.size() >=12){
//            return R.error("该库位排已满");
//        }
@@ -578,8 +578,8 @@
                return R.error("入库数量大于可入数量");
            }
            //查询平库中是否有一样的物料号,有的话直接增加数量
//            ManLocDetl checkManLocDetl = manLocDetlService.selectInventory(jsonLocNo,orderDetl.getMatnr(),jsonOrderDetl.getBatch());
//            if (checkManLocDetl == null) {
            ManLocDetl checkManLocDetl = manLocDetlService.selectInventory(jsonLocNo,orderDetl.getMatnr(),jsonOrderDetl.getBatch());
            if (checkManLocDetl == null) {
                ManLocDetl manLocDetl = new ManLocDetl();
                Synchro.Copy(orderDetl, manLocDetl);
@@ -597,24 +597,24 @@
                if(!manLocDetlService.insert(manLocDetl)){
                    return R.error("插入平库物料失败!");
                }
//            }
//            else {
//                  if (checkManLocDetl.getWeight() == null){
//                      checkManLocDetl.setWeight(0.0);
//                  }
//                  if (jsonOrderDetl.getWeight() == null){
//                      jsonOrderDetl.setWeight(0.0);
//                  }
//                if(manLocDetlService.increase(checkManLocDetl.getAnfme() + jsonOrderDetl.getAnfme(),
//                        node.getName(),
//                        jsonOrderDetl.getMatnr(),
//                        jsonOrderDetl.getBatch(),checkManLocDetl.getWeight()+jsonOrderDetl.getWeight()
//                        )<=0
//                        ){
//                    return R.error("修改平库物料失败!");
//                }
//
//            }
            }
            else {
                  if (checkManLocDetl.getWeight() == null){
                      checkManLocDetl.setWeight(0.0);
                  }
                  if (jsonOrderDetl.getWeight() == null){
                      jsonOrderDetl.setWeight(0.0);
                  }
                if(manLocDetlService.increase(checkManLocDetl.getAnfme() + jsonOrderDetl.getAnfme(),
                        node.getName(),
                        jsonOrderDetl.getMatnr(),
                        jsonOrderDetl.getBatch(),checkManLocDetl.getWeight()+jsonOrderDetl.getWeight()
                        )<=0
                        ){
                    return R.error("修改平库物料失败!");
                }
            }
            orderDetl.setQty(orderDetl.getQty() + jsonOrderDetl.getAnfme());
            orderDetl.setWorkQty(orderDetl.getWorkQty() + jsonOrderDetl.getAnfme());
            orderDetl.setUpdateTime(date);
src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
@@ -227,4 +227,9 @@
        page.setTotal(baseMapper.listByPageCount(page.getCondition()));
        return page;
    }
    @Override
    public List<String> getRemmendLoc(String matnr) {
        return this.baseMapper.getRommendLoc(matnr);
    }
}
src/main/java/com/zy/asrs/service/impl/PakoutServiceImpl.java
@@ -1,13 +1,12 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.zy.asrs.entity.ManLocDetl;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.mapper.PakoutMapper;
import com.zy.asrs.entity.Pakout;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.service.PakoutService;
import com.zy.asrs.service.*;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -22,6 +21,9 @@
    @Autowired
    private OrderDetlService orderDetlService;
    @Autowired
    private ManLocDetlService manLocDetlService;
    @Override
    public void deletePakout(String docNum) {
@@ -42,6 +44,20 @@
       if (!orderService.updateById(order)){
           throw new RuntimeException("订单明细批量更新失败");
       }
        List<Pakout> pakouts = selectList(new EntityWrapper<Pakout>().eq("doc_num", docNum));
       for (Pakout pakout: pakouts){
           ManLocDetl manLocDetl = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>()
                   .eq("loc_no", pakout.getLocNo())
                   .eq("matnr", pakout.getMatnr()));
           manLocDetl.setStatus(1);
           if (!manLocDetlService.update(manLocDetl,new EntityWrapper<ManLocDetl>()
                   .eq("loc_no", pakout.getLocNo())
                   .eq("matnr", pakout.getMatnr()))){
               throw new RuntimeException("库存状态更新失败");
           }
       }
      if (!delete(new EntityWrapper<Pakout>().eq("doc_num",docNum))){
          throw new RuntimeException("拣货单删除失败");
      }
src/main/java/com/zy/common/CodeBuilder.java
@@ -17,10 +17,10 @@
//        generator.table="sys_host";
        // sqlserver
        generator.sqlOsType = SqlOsType.SQL_SERVER;
        generator.url="192.168.4.15:1433;databasename=stasrs";
        generator.url="192.168.4.15:1433;databasename=hzjzasrs";
        generator.username="sa";
        generator.password="sa@123";
        generator.table="man_loc_check_trim";
        generator.table="asr_loc_rule";
        generator.packagePath="com.zy.asrs";
        generator.build();
    }
src/main/java/com/zy/common/model/LocDto.java
@@ -41,24 +41,26 @@
    public LocDto() {
    }
    public LocDto(Long hostId,String locNo, String matnr, String batch, Double anfme) {
    public LocDto(Long hostId,String locNo, String matnr, String batch, Double anfme,String manu) {
        this.locNo = locNo;
        this.matnr = matnr;
        this.batch = batch;
        this.anfme = anfme;
        this.hostId = hostId;
        this.manu = manu;
    }
    public LocDto(Long hostId,String locNo, String matnr, String batch, String orderNo, Double anfme) {
    public LocDto(Long hostId,String locNo, String matnr, String batch, String orderNo, Double anfme,String manu) {
        this.locNo = locNo;
        this.matnr = matnr;
        this.batch = batch;
        this.orderNo = orderNo;
        this.anfme = anfme;
        this.hostId = hostId;
        this.manu = manu;
    }
    public LocDto(Long hostId,String locNo, String matnr, String maktx, String batch, String orderNo, Double anfme) {
    public LocDto(Long hostId,String locNo, String matnr, String maktx, String batch, String orderNo, Double anfme,String manu) {
        this.locNo = locNo;
        this.matnr = matnr;
        this.maktx = maktx;
@@ -66,10 +68,11 @@
        this.orderNo = orderNo;
        this.anfme = anfme;
        this.hostId = hostId;
        this.manu = manu;
    }
    public LocDto(Long hostId,String locNo, String matnr, String maktx, String batch, String orderNo, Double anfme, Double needQty) {
    public LocDto(Long hostId,String locNo, String matnr, String maktx, String batch, String orderNo, Double anfme, Double needQty,String manu) {
        this.locNo = locNo;
        this.matnr = matnr;
        this.maktx = maktx;
@@ -78,6 +81,7 @@
        this.anfme = anfme;
        this.needQty = needQty;
        this.hostId = hostId;
        this.manu = manu;
    }
    public String getTitle() {
src/main/java/locRule.sql
New file
@@ -0,0 +1,18 @@
-- save locRule record
-- mysql
insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locRule/locRule.html', 'locRule管理', null , '2', null , '1');
insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locRule#view', '查询', '', '3', '0', '1');
insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locRule#btn-add', '新增', '', '3', '1', '1');
insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locRule#btn-edit', '编辑', '', '3', '2', '1');
insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locRule#btn-delete', '删除', '', '3', '3', '1');
insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locRule#btn-export', '导出', '', '3', '4', '1');
-- sqlserver
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locRule/locRule.html', N'locRule管理', null, '2', null, '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locRule#view', N'查询', '', '3', '0', '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locRule#btn-add', N'新增', '', '3', '1', '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locRule#btn-edit', N'编辑', '', '3', '2', '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locRule#btn-delete', N'删除', '', '3', '3', '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locRule#btn-export', N'导出', '', '3', '4', '1');
src/main/resources/AMap.json
@@ -1 +1 @@
[[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":0,"y":0},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":0,"y":1},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":0,"y":2},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":0,"y":3},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":0,"y":4},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":0,"y":5},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":0,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":1,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":1,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":1,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":1,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":1,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":1,"y":5},{"value":-17,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":1,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":2,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":2,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":2,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":2,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":2,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":2,"y":5},{"value":-16,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":2,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":3,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":3,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":3,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":3,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":3,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":3,"y":5},{"value":-15,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":3,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":4,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":4,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":4,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":4,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":4,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":4,"y":5},{"value":-14,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":4,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":5,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":5,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":5,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":5,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":5,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":5,"y":5},{"value":-13,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":5,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":6,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":6,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":6,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":6,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":6,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":6,"y":5},{"value":-12,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":6,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":7,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":7,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":7,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":7,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":7,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":7,"y":5},{"value":-11,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":7,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":8,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":8,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":8,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":8,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":8,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":8,"y":5},{"value":-10,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":8,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":9,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":9,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":9,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":9,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":9,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":9,"y":5},{"value":-9,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":9,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":10,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":10,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":10,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":10,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":10,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":10,"y":5},{"value":-8,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":10,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":11,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":11,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":11,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":11,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":11,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":11,"y":5},{"value":-7,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":11,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":12,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":12,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":12,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":12,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":12,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":12,"y":5},{"value":-6,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":12,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":13,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":13,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":13,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":13,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":13,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":13,"y":5},{"value":-5,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":13,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":14,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":14,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":14,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":14,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":14,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":14,"y":5},{"value":-4,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":14,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":15,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":15,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":15,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":15,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":15,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":15,"y":5},{"value":-3,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":15,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":16,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":16,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":16,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":16,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":16,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":16,"y":5},{"value":-2,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":16,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":17,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":17,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":17,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":17,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":17,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":17,"y":5},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":17,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":18,"y":0},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":18,"y":1},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":18,"y":2},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":18,"y":3},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":18,"y":4},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":18,"y":5},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":18,"y":6}]]
[[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":0,"y":0},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":0,"y":1},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":0,"y":2},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":0,"y":3},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":0,"y":4},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":0,"y":5}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":1,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":1,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":1,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":1,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":1,"y":4},{"value":-20,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":1,"y":5}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":2,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":2,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":2,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":2,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":2,"y":4},{"value":-19,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":2,"y":5}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":3,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":3,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":3,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":3,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":3,"y":4},{"value":-18,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":3,"y":5}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":4,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":4,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":4,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":4,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":4,"y":4},{"value":-17,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":4,"y":5}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":5,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":5,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":5,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":5,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":5,"y":4},{"value":-16,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":5,"y":5}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":6,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":6,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":6,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":6,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":6,"y":4},{"value":-15,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":6,"y":5}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":7,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":7,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":7,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":7,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":7,"y":4},{"value":-14,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":7,"y":5}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":8,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":8,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":8,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":8,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":8,"y":4},{"value":-13,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":8,"y":5}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":9,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":9,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":9,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":9,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":9,"y":4},{"value":-12,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":9,"y":5}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":10,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":10,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":10,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":10,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":10,"y":4},{"value":-11,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":10,"y":5}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":11,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":11,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":11,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":11,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":11,"y":4},{"value":-10,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":11,"y":5}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":12,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":12,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":12,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":12,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":12,"y":4},{"value":-9,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":12,"y":5}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":13,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":13,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":13,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":13,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":13,"y":4},{"value":-8,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":13,"y":5}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":14,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":14,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":14,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":14,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":14,"y":4},{"value":-7,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":14,"y":5}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":15,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":15,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":15,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":15,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":15,"y":4},{"value":-6,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":15,"y":5}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":16,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":16,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":16,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":16,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":16,"y":4},{"value":-5,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":16,"y":5}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":17,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":17,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":17,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":17,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":17,"y":4},{"value":-4,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":17,"y":5}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":18,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":18,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":18,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":18,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":18,"y":4},{"value":-3,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":18,"y":5}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":19,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":19,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":19,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":19,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":19,"y":4},{"value":-2,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":19,"y":5}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":20,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":20,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":20,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":20,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":20,"y":4},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":20,"y":5}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":21,"y":0},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":21,"y":1},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":21,"y":2},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":21,"y":3},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":21,"y":4},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":21,"y":5}]]
src/main/resources/mapper/LocRuleMapper.xml
New file
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.mapper.LocRuleMapper">
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.LocRule">
        <id column="id" property="id" />
        <result column="matnr" property="matnr" />
        <result column="specs" property="specs" />
        <result column="model" property="model" />
        <result column="cstmr" property="cstmr" />
        <result column="batch" property="batch" />
        <result column="other" property="other" />
        <result column="row_beg" property="rowBeg" />
        <result column="row_end" property="rowEnd" />
        <result column="bay_beg" property="bayBeg" />
        <result column="bay_end" property="bayEnd" />
        <result column="lev_beg" property="levBeg" />
        <result column="lev_end" property="levEnd" />
        <result column="limit" property="limit" />
        <result column="status" property="status" />
        <result column="create_by" property="createBy" />
        <result column="create_time" property="createTime" />
        <result column="update_by" property="updateBy" />
        <result column="update_time" property="updateTime" />
        <result column="memo" property="memo" />
        <result column="mixed" property="mixed" />
        <result column="keep_go" property="keepGo" />
        <result column="maktx" property="maktx" />
    </resultMap>
</mapper>
src/main/resources/mapper/NodeMapper.xml
@@ -82,5 +82,9 @@
        AND (CHARINDEX(','+#{tag_id}+',', ','+mt.path+',') > 0 OR mt.id = #{tag_id})
        <include refid="nodeCondition"></include>
    </select>
    <select id="getRommendLoc" resultType="java.lang.String">
        select name from man_node
        where level = 3 and parent_name = 'C'
    </select>
</mapper>
src/main/webapp/static/js/locRule/locRule.js
New file
@@ -0,0 +1,272 @@
var pageCurr;
layui.config({
    base: baseUrl + "/static/layui/lay/modules/"
}).use(['table','laydate', 'form', 'admin'], function(){
    var table = layui.table;
    var $ = layui.jquery;
    var layer = layui.layer;
    var layDate = layui.laydate;
    var form = layui.form;
    var admin = layui.admin;
    // 数据渲染
    tableIns = table.render({
        elem: '#locRule',
        headers: {token: localStorage.getItem('token')},
        url: baseUrl+'/locRule/list/auth',
        page: true,
        limit: 15,
        limits: [15, 30, 50, 100, 200, 500],
        toolbar: '#toolbar',
        cellMinWidth: 50,
        height: 'full-120',
        cols: [[
            {type: 'checkbox'}
            ,{field: 'id', align: 'center',title: ''}
            ,{field: 'matnr', align: 'center',title: ''}
            ,{field: 'specs', align: 'center',title: ''}
            ,{field: 'model', align: 'center',title: ''}
            ,{field: 'cstmr', align: 'center',title: ''}
            ,{field: 'batch', align: 'center',title: ''}
            ,{field: 'other', align: 'center',title: ''}
            ,{field: 'rowBeg', align: 'center',title: ''}
            ,{field: 'rowEnd', align: 'center',title: ''}
            ,{field: 'bayBeg', align: 'center',title: ''}
            ,{field: 'bayEnd', align: 'center',title: ''}
            ,{field: 'levBeg', align: 'center',title: ''}
            ,{field: 'levEnd', align: 'center',title: ''}
            ,{field: 'limit', align: 'center',title: ''}
            ,{field: 'status', align: 'center',title: ''}
            ,{field: 'createBy', align: 'center',title: ''}
            ,{field: 'createTime$', align: 'center',title: ''}
            ,{field: 'updateBy', align: 'center',title: ''}
            ,{field: 'updateTime$', align: 'center',title: ''}
            ,{field: 'memo', align: 'center',title: ''}
            ,{field: 'mixed$', align: 'center',title: '是否支持混载'}
            ,{field: 'keepGo$', align: 'center',title: '支持混载情况下,没找到库位是否继续寻找'}
            ,{field: 'maktx', align: 'center',title: ''}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:120}
        ]],
        request: {
            pageName: 'curr',
            pageSize: 'limit'
        },
        parseData: function (res) {
            return {
                'code': res.code,
                'msg': res.msg,
                'count': res.data.total,
                'data': res.data.records
            }
        },
        response: {
            statusCode: 200
        },
        done: function(res, curr, count) {
            if (res.code === 403) {
                top.location.href = baseUrl+"/";
            }
            pageCurr=curr;
            limit();
        }
    });
    // 监听排序事件
    table.on('sort(locRule)', function (obj) {
        var searchData = {};
        $.each($('#search-box [name]').serializeArray(), function() {
            searchData[this.name] = this.value;
        });
        searchData['orderByField'] = obj.field;
        searchData['orderByType'] = obj.type;
        tableIns.reload({
            where: searchData,
            page: {curr: 1}
        });
    });
    // 监听头工具栏事件
    table.on('toolbar(locRule)', function (obj) {
        var checkStatus = table.checkStatus(obj.config.id).data;
        switch(obj.event) {
            case 'addData':
                showEditModel();
                break;
            case 'deleteData':
               if (checkStatus.length === 0) {
                   layer.msg('请选择要删除的数据', {icon: 2});
                   return;
               }
               del(checkStatus.map(function (d) {
                   return d.id;
               }));
               break;
            case 'exportData':
                admin.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {
                        if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
                            titles.push(col.title);
                            fields.push(col.field);
                        }
                    });
                    var exportData = {};
                    $.each($('#search-box [name]').serializeArray(), function() {
                        exportData[this.name] = this.value;
                    });
                    var param = {
                        'locRule': exportData,
                        'fields': fields
                    };
                    $.ajax({
                        url: baseUrl+"/locRule/export/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: JSON.stringify(param),
                        dataType:'json',
                        contentType:'application/json;charset=UTF-8',
                        method: 'POST',
                        success: function (res) {
                            layer.closeAll();
                            if (res.code === 200) {
                                table.exportFile(titles,res.data,'xls');
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg, {icon: 2})
                            }
                        }
                    });
                });
                break;
        }
    });
    // 监听行工具事件
    table.on('tool(locRule)', function(obj){
        var data = obj.data;
        switch (obj.event) {
            case 'edit':
                showEditModel(data);
                break;
            case "del":
                del([data.id]);
                break;
        }
    });
    /* 弹窗 - 新增、修改 */
    function showEditModel(mData) {
        admin.open({
            type: 1,
            area: '600px',
            title: (mData ? '修改' : '添加') + '订单状态',
            content: $('#editDialog').html(),
            success: function (layero, dIndex) {
                layDateRender(mData);
                form.val('detail', mData);
                form.on('submit(editSubmit)', function (data) {
                    var loadIndex = layer.load(2);
                    $.ajax({
                        url: baseUrl+"/locRule/"+(mData?'update':'add')+"/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: data.field,
                        method: 'POST',
                        success: function (res) {
                            layer.close(loadIndex);
                            if (res.code === 200){
                                layer.close(dIndex);
                                layer.msg(res.msg, {icon: 1});
                                tableReload();
                            } else if (res.code === 403){
                                top.location.href = baseUrl+"/";
                            }else {
                                layer.msg(res.msg, {icon: 2});
                            }
                        }
                    })
                    return false;
                });
                $(layero).children('.layui-layer-content').css('overflow', 'visible');
                layui.form.render('select');
            }
        });
    }
    /* 删除 */
    function del(ids) {
        layer.confirm('确定要删除选中数据吗?', {
            skin: 'layui-layer-admin',
            shade: .1
        }, function (i) {
            layer.close(i);
            var loadIndex = layer.load(2);
            $.ajax({
                url: baseUrl+"/locRule/delete/auth",
                headers: {'token': localStorage.getItem('token')},
                data: {ids: ids},
                method: 'POST',
                success: function (res) {
                    layer.close(loadIndex);
                    if (res.code === 200){
                        layer.msg(res.msg, {icon: 1});
                        tableReload();
                    } else if (res.code === 403){
                        top.location.href = baseUrl+"/";
                    } else {
                        layer.msg(res.msg, {icon: 2});
                    }
                }
            })
        });
    }
    // 搜索
    form.on('submit(search)', function (data) {
        pageCurr = 1;
        tableReload(false);
    });
    // 重置
    form.on('submit(reset)', function (data) {
        pageCurr = 1;
        clearFormVal($('#search-box'));
        tableReload(false);
    });
    // 时间选择器
    function layDateRender(data) {
        setTimeout(function () {
            layDate.render({
                elem: '#createTime\\$',
                type: 'datetime',
                value: data!==undefined?data['createTime\\$']:null
            });
            layDate.render({
                elem: '#updateTime\\$',
                type: 'datetime',
                value: data!==undefined?data['updateTime\\$']:null
            });
        }, 300);
    }
    layDateRender();
});
// 关闭动作
$(document).on('click','#data-detail-close', function () {
    parent.layer.closeAll();
});
function tableReload(child) {
    var searchData = {};
    $.each($('#search-box [name]').serializeArray(), function() {
        searchData[this.name] = this.value;
    });
    tableIns.reload({
        where: searchData,
        page: {curr: pageCurr}
     });
}
src/main/webapp/static/js/picking/picking.js
@@ -335,11 +335,7 @@
                success: function (res) {
                    layer.closeAll('loading');
                    if (res.code === 200){
                        if (insTbCount === 0) {
                            insTb.reload({page: {curr: 1}});
                        } else {
                            $(".layui-laypage-btn")[0].click();
                        }
                        tableIns.reload({page: {curr: 1}});
                        layer.msg(res.msg, {icon: 1});
                    } else if (res.code === 403){
                        top.location.href = baseUrl+"/";
src/main/webapp/views/locRule/locRule.html
New file
@@ -0,0 +1,217 @@
<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="utf-8">
    <title></title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
</head>
<body>
<div class="layui-fluid">
    <div class="layui-card">
        <div class="layui-card-body">
            <div class="layui-form toolbar" id="search-box">
                <div class="layui-form-item">
                    <div class="layui-inline">
                        <label class="layui-form-label">编号:</label>
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">&emsp;
                        <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
                            <i class="layui-icon">&#xe615;</i>搜索
                        </button>
                        <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
                            <i class="layui-icon">&#xe666;</i>重置
                        </button>
                    </div>
                </div>
            </div>
            <table class="layui-hide" id="locRule" lay-filter="locRule"></table>
        </div>
    </div>
</div>
<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>
        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">删除</button>
        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">导出</button>
    </div>
</script>
<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<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/locRule/locRule.js" charset="utf-8"></script>
</body>
<!-- 表单弹窗 -->
<script type="text/html" id="editDialog">
    <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
        <input name="id" type="hidden">
        <div class="layui-row">
            <div class="layui-col-md12">
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="matnr" placeholder="请输入">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="specs" placeholder="请输入">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="model" placeholder="请输入">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="cstmr" placeholder="请输入">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="batch" placeholder="请输入">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="other" placeholder="请输入">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="rowBeg" placeholder="请输入">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="rowEnd" placeholder="请输入">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="bayBeg" placeholder="请输入">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="bayEnd" placeholder="请输入">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="levBeg" placeholder="请输入">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="levEnd" placeholder="请输入">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="limit" placeholder="请输入">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="status" placeholder="请输入">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="createBy" placeholder="请输入">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="createTime" id="createTime$" placeholder="请输入">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="updateBy" placeholder="请输入">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="updateTime" id="updateTime$" placeholder="请输入">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="memo" placeholder="请输入">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">是否支持混载: </label>
                    <div class="layui-input-block">
                        <select name="mixed">
                            <option value="">请选择是否支持混载</option>
                            <option value="0">不支持</option>
                            <option value="1">支持</option>
                        </select>
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">支持混载情况下,没找到库位是否继续寻找: </label>
                    <div class="layui-input-block">
                        <select name="keepGo">
                            <option value="">请选择支持混载情况下,没找到库位是否继续寻找</option>
                            <option value="0">否</option>
                            <option value="1">是</option>
                        </select>
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="maktx" placeholder="请输入">
                    </div>
                </div>
             </div>
        </div>
        <hr class="layui-bg-gray">
        <div class="layui-form-item text-right">
            <button class="layui-btn" lay-filter="editSubmit" lay-submit="">保存</button>
            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button>
        </div>
    </form>
</script>
</html>