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

skyouc

昨天 bb2ba875a4c7ed5f0c31a216862c5fd4cbf88c6e

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

@@ -10,17 +10,19 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.LocMastInitParam;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.common.entity.Parameter;
import com.zy.common.model.Shelves;
import com.zy.common.service.CommonService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.*;

@RestController
@@ -30,6 +32,20 @@
    private LocMastService locMastService;
    @Autowired
    private LocDetlService locDetlService;
    @Autowired
    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;

    @RequestMapping(value = "/locMast/init/pwd")
    public R locMastInitPwd(@RequestParam(required = false) String pwd) {
@@ -53,27 +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 void convert(Map<String, Object> map, EntityWrapper wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            if (entry.getKey().endsWith(">")) {
                wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
            } else if (entry.getKey().endsWith("<")) {
                wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
        boolean sign = false;
        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 if (entry.getKey().equals("loc_no")) {
                wrapper.like(entry.getKey(), val);
            } else {
                wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
                if (entry.getKey().equals("loc_type1")) {
                    sign = true;
                }
                wrapper.eq(entry.getKey(), val);
            }
        }
        if (sign) {
            wrapper.and().ne("loc_sts", "Y");
        }
    }

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

   @RequestMapping(value = "/locMast/update/auth")
   @ManagerAuth(memo = "库位修改")
    public R update(LocMast locMast){
        if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
    @RequestMapping(value = "/locMast/update/auth")
    @ManagerAuth(memo = "库位修改")
    public R update(LocMast locMast) {

        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("该库位正在作业，请先处理工作档");
        }

        LocMast oldLocMast = locMastService.selectById(locMast.getLocNo());
        if (locMast.getLocSts().equals("F") && (oldLocMast.getLocSts().equals("D") || oldLocMast.getLocSts().equals("O"))) {
            return R.error("当前操作已被阻止，请联系管理员");
        }
        Date now = new Date();
        // 有物料时修改为空库位或者空板库位，则删除库存明细
        if (oldLocMast.getLocType().equals("R") || oldLocMast.getLocType().equals("F")) {
            if (locMast.getLocType().equals("O") || locMast.getLocType().equals("D")) {
                locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
        if (oldLocMast.getLocSts().equals("R") || oldLocMast.getLocSts().equals("F") || oldLocMast.getLocSts().equals("S")) {
            if (locMast.getLocSts().equals("O") || locMast.getLocSts().equals("D")) {
                List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
                // 添加历史工作主档
                WrkMastLog wrkMastLog = new WrkMastLog();
                wrkMastLog.setWrkNo(commonService.getWorkNo(3));
                wrkMastLog.setIoTime(now);
                wrkMastLog.setWrkSts(5);
                wrkMastLog.setIoType(19);
                wrkMastLog.setIoPri(13D); // 优先级
                wrkMastLog.setCrnNo(locMast.getCrnNo());
                wrkMastLog.setSourceLocNo(locMast.getLocNo());
                wrkMastLog.setLocNo(locMast.getLocNo());
                wrkMastLog.setBarcode(locMast.getBarcode()); // 托盘码
                wrkMastLog.setFullPlt("Y"); // 满板：Y
                wrkMastLog.setPicking("N"); // 拣料
                wrkMastLog.setExitMk("N"); // 退出
                wrkMastLog.setEmptyMk("N"); // 空板
                wrkMastLog.setLinkMis("Y");
                // 操作人员数据
                wrkMastLog.setAppeTime(now);
                wrkMastLog.setModiTime(now);
                wrkMastLog.setAppeUser(getUserId());
                wrkMastLog.setModiUser(getUserId());
                boolean res = wrkMastLogService.insert(wrkMastLog);
                if (!res) {
                    throw new CoolException("保存工作档失败");
                }
                for (LocDetl locDetl : locDetls) {
                    // 保存调整记录
                    AdjDetl adjDetl = new AdjDetl();
                    adjDetl.setLocNo(locDetl.getLocNo());
                    adjDetl.setMatnr(locDetl.getMatnr());
                    adjDetl.setBatch(locDetl.getBatch());
                    adjDetl.setOriQty(locDetl.getAnfme());
                    adjDetl.setAdjQty(0.0D);
                    adjDetl.setModiTime(now);
                    adjDetl.setModiUser(getUserId());
                    adjDetl.setAppeTime(now);
                    adjDetl.setAppeUser(getUserId());
                    if (!adjDetlService.insert(adjDetl)) {
                        throw new CoolException("服务器错误，请联系管理员");
                    }

                    // 添加历史工作明细
                    WrkDetlLog wrkDetl = new WrkDetlLog();
                    wrkDetl.sync(locDetl);
                    wrkDetl.setWrkNo(wrkMastLog.getWrkNo());
                    wrkDetl.setIoTime(wrkMastLog.getIoTime());
                    wrkDetl.setAnfme(0.0);
                    wrkDetl.setAppeTime(now);
                    wrkDetl.setModiTime(now);
                    wrkMastLog.setAppeUser(getUserId());
                    wrkMastLog.setModiUser(getUserId());
                    if (!wrkDetlLogService.insert(wrkDetl)) {
                        throw new CoolException("保存工作明细失败");
                    }
                }
                if (!locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()))) {
                    throw new CoolException("服务器错误，请联系管理员");
                }
                locMast.setBarcode("");
            }
        }
        locMast.setModiUser(getUserId());
        locMast.setModiTime(new Date());
        locMastService.updateById(locMast);
        locMast.setModiTime(now);
        AdjDetl adjDetl = new AdjDetl();
        adjDetl.setLocNo(locMast.getLocNo());
        adjDetl.setMatnr("原库位状态：" + oldLocMast.getLocSts());
        adjDetl.setBatch("更改库位状态为：" + locMast.getLocSts());
        adjDetl.setModiTime(now);
        adjDetl.setModiUser(getUserId());
        if (!adjDetlService.insert(adjDetl)) {
            throw new CoolException("库位调整记录失败");
        }
        // 库位冻结->冻结所有库存
        if (locMast.getFrozen() == 1 && oldLocMast.getFrozen() == 0 && locMast.getLocSts().equals("F") && oldLocMast.getLocSts().equals("F")) {
            locDetlMapper.updateDetlFrozenByLocNo(oldLocMast.getLocNo());
        }
        if (!locMastService.updateById(locMast)) {
            throw new CoolException("服务器错误，请联系管理员");
        }
        return R.ok();
    }

    @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();
@@ -122,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"));
@@ -138,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());
@@ -151,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();
@@ -161,42 +276,63 @@
    @ManagerAuth(memo = "初始化库位")
//    @Transactional
    public R init(LocMastInitParam param) {
        List<LocMast> list = new ArrayList<>();
        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;
                    Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getCrnAmount());
                    for (List<Integer> node : shelves.nodes){
                        if (node.contains(r)) {
                            crnNo = shelves.nodes.indexOf(node) + 1;
                            break;
        try {
            List<LocMast> list = new ArrayList<>();
            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++) {
                        // 获取库位号
                        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) {
                                if (node.contains(r)) {
                                    if (!Cools.isEmpty(param.getStaCrn()) && param.getStaCrn() > 0) {
                                        crnNo = shelves.nodes.indexOf(node) + param.getStaCrn();
                                    } else {
                                        crnNo = shelves.nodes.indexOf(node) + 1;
                                    }
                                    break;
                                }
                            }
                        } catch (Exception e) {
                            throw new Exception("解析堆垛机号失败，请填写正确的数据!!!");
                        }

                        Date now = new Date();
                        LocMast locMast = new LocMast();
                        locMast.setLocNo(locNo);
                        locMast.setLocSts("O");
                        locMast.setRow1(r); // 排
                        locMast.setBay1(b); // 列
                        locMast.setLev1(l); // 层
                        locMast.setGro1(r); // 组
                        locMast.setCrnNo(crnNo); // 堆垛机
                        locMast.setLocType1(!Cools.isEmpty(param.getLocType1()) ? param.getLocType1() : 1);
                        locMast.setLocType2(param.getLocType2());
                        locMast.setLocType3(param.getLocType3());
                        locMast.setAppeUser(getUserId());
                        locMast.setAppeTime(now);
                        locMast.setModiUser(getUserId());
                        locMast.setModiTime(now);
                        locMast.setWhsType(basWhsType.getId());
                        list.add(locMast);
                    }
                    LocMast locMast = new LocMast();
                    locMast.setLocNo(locNo);
                    locMast.setLocType("O");
                    locMast.setRow1(r); // 排
                    locMast.setBay1(b); // 列
                    locMast.setLev1(l); // 层
                    locMast.setCrnNo(crnNo); // 堆垛机
                    if (null != param.getWhsType()) {
                        locMast.setWhsType(Long.valueOf(param.getWhsType()));
                    }
                    locMast.setAppeUser(getUserId());
                    locMast.setAppeTime(new Date());
                    locMast.setModiUser(getUserId());
                    locMast.setModiTime(new Date());
                    list.add(locMast);
                }
            }
            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());
        }
        locMastService.delete(new EntityWrapper<>());
        locDetlService.delete(new EntityWrapper<>());
        locMastService.insertBatch(list);
        return R.ok("初始化成功");
    }
}