自动化立体仓库 - WMS系统
lty
2025-01-07 9c699c554f021930ee3598261f43e6dfd9cccb9c
src/main/java/com/zy/common/web/WcsController.java
@@ -10,6 +10,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.param.StatusParam;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
import com.zy.common.CodeRes;
import com.zy.common.model.LocTypeDto;
@@ -57,6 +58,8 @@
    private WorkService workService;
    @Autowired
    private ApiLogService apiLogService;
    @Autowired
    private WrkMastMapper wrkMastMapper;
    @Value("${wcs-slave.url}")
    private String url;
    @Value("${wcs-slave.loc}")
@@ -332,7 +335,7 @@
        }else if(!Cools.isEmpty(wrkMast)&&statusParam.getTaskStatus()==8&&wrkMast.getIoType()==110){
            return Re.ok();
        }
        /**
        /*
         * 任务状态
         * 执行过程中
         * 的状态。 0- 已 接
@@ -344,20 +347,33 @@
        if (statusParam.getTaskStatus()==0){
            //拣料和盘点再入库判断
            if((wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107) && wrkMast.getWrkSts() == 14){
//                LocDetl locDetl = locDetlService.selectItemByLocNo(wrkMast.getSourceLocNo());
//                List<WrkDetl> wrkDetl = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
                String sourcecLocNo = wrkMast.getSourceLocNo();
//                // 获取后两位的层数
//                String layerStr = sourcecLocNo.substring(sourcecLocNo.length() - 2);
//                int layer = Integer.parseInt(layerStr);
//                // 判断层数
//                Short locType1 = (short) ((layer == 1) ? 1 : 2);
//                LocTypeDto locTypeDto = new LocTypeDto();
//                locTypeDto.setLocType1(locType1);
//                StartupDto dto = commonService.getLocNoRunPick(4, 1, 101, wrkDetl.get(0).getMatnr(), wrkDetl.get(0).getBatch(), null, 4, locTypeDto, 2);
                Date now = new Date();
                wrkMast.setIoTime(now);
                wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54,107->57
                wrkMast.setWrkSts(1L);//1.已接收
                wrkMast.setSourceStaNo(101); // 源站
                wrkMast.setStaNo(null); // 目标站
                wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 目标库位 = 出库时的源库位
                wrkMast.setSourceLocNo(""); // 源库位清空
                wrkMast.setLocNo(sourcecLocNo); // 目标库位
                wrkMast.setSourceLocNo("");
                wrkMast.setModiTime(now);
                wrkDetlService.updateIoTime(wrkMast.getWrkNo(), now);
                // 修改库位状态 Q.拣料/盘点/并板再入库
                LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
                locMast.setLocSts("Q");
                locMast.setModiTime(new Date());
                if (!locMastService.updateById(locMast)) {
                LocMast locMast2 = locMastService.selectById(sourcecLocNo);
                locMast2.setLocSts("Q");
                locMast2.setModiTime(new Date());
                if (!locMastService.updateById(locMast2)) {
                    throw new CoolException("修改库位状态失败");
                }
@@ -390,7 +406,7 @@
        for (LocMast locMast : locMasts) {
            if (locMast.getLev1()!=4){
                HashMap<String,Object> map=new HashMap<>();
                map.put("warehouse","wzzy");
                map.put("warehouse", "ddth");
                map.put("posiX",locMast.getRow1());
                map.put("posiY",locMast.getBay1());
                map.put("posiZ",locMast.getLev1());
@@ -432,7 +448,9 @@
                            response,
                            success
                    );
                } catch (Exception e) { log.error("", e); }
                } catch (Exception e) {
                    log.error("", e);
                }
            }
        }
    }