src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -20,7 +20,7 @@ import com.zy.asrs.service.BasCrnpService; import com.zy.asrs.service.BasDevpService; import com.zy.asrs.service.DeviceErrorService; import com.zy.asrs.service.WrkMastService; import com.zy.asrs.service.TaskWrkService; import com.zy.common.CodeRes; import com.zy.core.CrnThread; import com.zy.core.DevpThread; @@ -57,8 +57,6 @@ @Autowired private SlaveProperties slaveProperties; @Autowired private WrkMastService wrkMastService; @Autowired private BasDevpService basDevpService; @Autowired private LocMastMapper locMastMapper; @@ -70,6 +68,8 @@ private DeviceErrorService deviceErrorService; @Autowired private BasCrnpService basCrnpService; @Autowired private TaskWrkService taskWrkService; @PostMapping("/system/running/status") @ManagerAuth(memo = "系统运行状态") @@ -151,9 +151,9 @@ vo.setCrnStatus(CrnStatusType.MACHINE_ERROR); } else { if (crnProtocol.getTaskNo()>0) { WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo()); if (wrkMast != null) { vo.setCrnStatus(CrnStatusType.process(wrkMast.getIoType())); TaskWrk taskWrk = taskWrkService.selectByWrkNo(crnProtocol.getTaskNo().intValue()); if (taskWrk != null) { vo.setCrnStatus(CrnStatusType.process(taskWrk.getIoType())); } else { vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO: CrnStatusType.MACHINE_UN_AUTO); } @@ -279,14 +279,14 @@ vo.setWorkNo(staProtocol.getWorkNo()); // 工作号 if (staProtocol.getWorkNo() > 0) { WrkMast wrkMast = wrkMastService.selectById(staProtocol.getWorkNo()); if (wrkMast != null) { vo.setWrkSts(wrkMast.getWrkSts$()); // 工作状态 vo.setIoType(wrkMast.getIoType$()); // 入出库类型 vo.setSourceStaNo(wrkMast.getSourceStaNo$()); vo.setStaNo(wrkMast.getStaNo$()); vo.setSourceLocNo(wrkMast.getSourceLocNo$()); vo.setLocNo(wrkMast.getLocNo$()); TaskWrk taskWrk = taskWrkService.selectByWrkNo(staProtocol.getWorkNo().intValue()); if (taskWrk != null) { vo.setWrkSts(taskWrk.getWrkSts$()); // 工作状态 vo.setIoType(taskWrk.getIoType$()); // 入出库类型 vo.setSourceStaNo(null); vo.setStaNo(null); vo.setSourceLocNo(taskWrk.getStartPoint()); vo.setLocNo(taskWrk.getTargetPoint()); } } @@ -330,14 +330,14 @@ } if (crnProtocol.getTaskNo() > 0) { WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo()); if (wrkMast != null) { vo.setSourceStaNo(wrkMast.getSourceStaNo$()); vo.setStaNo(wrkMast.getStaNo$()); vo.setWrkSts(wrkMast.getWrkSts$()); // 工作状态 vo.setIoType(wrkMast.getIoType$()); // 入出库类型 vo.setSourceLocNo(wrkMast.getSourceLocNo$()); vo.setLocNo(wrkMast.getLocNo$()); TaskWrk taskWrk = taskWrkService.selectByWrkNo(crnProtocol.getTaskNo().intValue()); if (taskWrk != null) { vo.setSourceStaNo(null); vo.setStaNo(null); vo.setWrkSts(taskWrk.getWrkSts$()); // 工作状态 vo.setIoType(taskWrk.getIoType$()); // 入出库类型 vo.setSourceLocNo(taskWrk.getStartPoint()); vo.setLocNo(taskWrk.getTargetPoint()); vo.setCrnStatus(crnProtocol.getStatusType().desc); vo.setError(""); // todo } src/main/java/com/zy/asrs/controller/CrnController.java
@@ -17,7 +17,7 @@ import com.zy.asrs.mapper.BasCrnErrorMapper; import com.zy.asrs.service.BasCrnpService; import com.zy.asrs.service.LocMastService; import com.zy.asrs.service.WrkMastService; import com.zy.asrs.service.TaskWrkService; import com.zy.asrs.utils.CommandUtils; import com.zy.asrs.utils.CrnOperaUtils; import com.zy.core.CrnThread; @@ -58,8 +58,6 @@ @Autowired private SlaveProperties slaveProperties; @Autowired private WrkMastService wrkMastService; @Autowired private BasCrnErrorMapper basCrnErrorMapper; @Autowired private BasCrnpService basCrnpService; @@ -67,6 +65,8 @@ private LocMastService locMastService; @Autowired private CrnOperaUtils crnOperaUtils; @Autowired private TaskWrkService taskWrkService; @ManagerAuth(memo = "进行中的命令") @@ -190,13 +190,13 @@ vo.setWorkNo(crnProtocol.getTaskNo()); // 任务号 if (crnProtocol.getTaskNo()>0) { WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo()); if (wrkMast != null) { vo.setStatus(CrnStatusType.process(wrkMast.getIoType()).getDesc()); // 模式状态 vo.setSourceStaNo(wrkMast.getSourceStaNo$()); // 源站 vo.setStaNo(wrkMast.getStaNo$()); // 目标站 vo.setSourceLocNo(wrkMast.getSourceLocNo()); // 源库位 vo.setLocNo(wrkMast.getLocNo()); // 目标库位 TaskWrk taskWrk = taskWrkService.selectByWrkNo(crnProtocol.getTaskNo().intValue()); if (taskWrk != null) { vo.setStatus(CrnStatusType.process(taskWrk.getIoType()).getDesc()); // 模式状态 vo.setSourceStaNo(null); // 源站 vo.setStaNo(null); // 目标站 vo.setSourceLocNo(taskWrk.getStartPoint()); // 源库位 vo.setLocNo(taskWrk.getTargetPoint()); // 目标库位 } } else { vo.setStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc()); // 模式状态 @@ -231,13 +231,13 @@ vo.setWorkNo(crnProtocol.getTaskNo()); // 任务号 if (crnProtocol.getTaskNo()>0) { WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo()); if (wrkMast != null) { vo.setStatus(CrnStatusType.process(wrkMast.getIoType()).getDesc()); // 模式状态 vo.setSourceStaNo(wrkMast.getSourceStaNo$()); // 源站 vo.setStaNo(wrkMast.getStaNo$()); // 目标站 vo.setSourceLocNo(wrkMast.getSourceLocNo()); // 源库位 vo.setLocNo(wrkMast.getLocNo()); // 目标库位 TaskWrk taskWrk = taskWrkService.selectByWrkNo(crnProtocol.getTaskNo().intValue()); if (taskWrk != null) { vo.setStatus(CrnStatusType.process(taskWrk.getIoType()).getDesc()); // 模式状态 vo.setSourceStaNo(null); // 源站 vo.setStaNo(null); // 目标站 vo.setSourceLocNo(taskWrk.getStartPoint()); // 源库位 vo.setLocNo(taskWrk.getTargetPoint()); // 目标库位 } } else { vo.setStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc()); // 模式状态 @@ -274,13 +274,13 @@ vo.setWorkNo(crnProtocol.getTaskNo()); // 任务号 if (crnProtocol.getTaskNo()>0) { WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo()); if (wrkMast != null) { vo.setDeviceStatus(CrnStatusType.process(wrkMast.getIoType()).getDesc()); // 模式状态 vo.setSourceStaNo(wrkMast.getSourceStaNo$()); // 源站 vo.setStaNo(wrkMast.getStaNo$()); // 目标站 vo.setSourceLocNo(wrkMast.getSourceLocNo()); // 源库位 vo.setLocNo(wrkMast.getLocNo()); // 目标库位 TaskWrk taskWrk = taskWrkService.selectByWrkNo(crnProtocol.getTaskNo().intValue()); if (taskWrk != null) { vo.setDeviceStatus(CrnStatusType.process(taskWrk.getIoType()).getDesc()); // 模式状态 vo.setSourceStaNo(null); // 源站 vo.setStaNo(null); // 目标站 vo.setSourceLocNo(taskWrk.getStartPoint()); // 源库位 vo.setLocNo(taskWrk.getTargetPoint()); // 目标库位 } } else { vo.setDeviceStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc()); // 模式状态 src/main/java/com/zy/asrs/controller/LocDetlController.java
File was deleted src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -10,13 +10,10 @@ 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.zy.asrs.entity.param.LocMastInitParam; import com.zy.asrs.service.LocDetlService; import com.zy.asrs.service.LocMastService; import com.zy.common.entity.Parameter; import com.zy.common.model.Shelves; import com.zy.common.web.BaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -28,8 +25,6 @@ @Autowired private LocMastService locMastService; @Autowired private LocDetlService locDetlService; @RequestMapping(value = "/locMast/init/pwd") public R locMastInitPwd(@RequestParam(required = false) String pwd) { @@ -203,7 +198,6 @@ } } locMastService.delete(new EntityWrapper<>()); locDetlService.delete(new EntityWrapper<>()); locMastService.insertBatch(list); return R.ok("初始化成功"); } src/main/java/com/zy/asrs/controller/OpenController.java
@@ -14,7 +14,6 @@ import com.zy.common.web.BaseController; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -47,9 +46,6 @@ private LocMastService locMastService; @Autowired private BasCrnErrorService basCrnErrorService; @Value("${wms.url}") private String wmsUrl; private static final boolean auth = true;
@@ -7,7 +7,6 @@ import com.core.common.R; import com.zy.asrs.entity.*; import com.zy.asrs.mapper.ReportQueryMapper; import com.zy.asrs.service.LocDetlService; import com.zy.common.web.BaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; @@ -29,8 +28,6 @@ @RequestMapping("/report") public class ReportQueryController extends BaseController { @Autowired private LocDetlService locDetlService; @Autowired private ReportQueryMapper reportQueryMapper;
File was deleted src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
File was deleted src/main/java/com/zy/asrs/controller/WrkMastController.java
File was deleted src/main/java/com/zy/asrs/controller/WrkMastLogController.java
File was deleted src/main/java/com/zy/asrs/entity/LocDetl.java
File was deleted src/main/java/com/zy/asrs/entity/MatCode.java
File was deleted src/main/java/com/zy/asrs/entity/RowLastno.java
File was deleted src/main/java/com/zy/asrs/entity/WaitPakin.java
File was deleted src/main/java/com/zy/asrs/entity/WrkDetl.java
File was deleted src/main/java/com/zy/asrs/entity/WrkDetlLog.java
File was deleted src/main/java/com/zy/asrs/entity/WrkMast.java
File was deleted src/main/java/com/zy/asrs/entity/WrkMastLog.java
File was deleted src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
File was deleted src/main/java/com/zy/asrs/mapper/MatCodeMapper.java
File was deleted src/main/java/com/zy/asrs/mapper/RowLastnoMapper.java
File was deleted src/main/java/com/zy/asrs/mapper/WaitPakinMapper.java
File was deleted src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java
File was deleted src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
File was deleted src/main/java/com/zy/asrs/mapper/WrkMastLogMapper.java
File was deleted src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
File was deleted src/main/java/com/zy/asrs/service/LocDetlService.java
File was deleted src/main/java/com/zy/asrs/service/MatCodeService.java
File was deleted src/main/java/com/zy/asrs/service/RowLastnoService.java
File was deleted src/main/java/com/zy/asrs/service/WaitPakinService.java
File was deleted src/main/java/com/zy/asrs/service/WrkDetlLogService.java
File was deleted src/main/java/com/zy/asrs/service/WrkDetlService.java
File was deleted src/main/java/com/zy/asrs/service/WrkMastLogService.java
File was deleted src/main/java/com/zy/asrs/service/WrkMastService.java
File was deleted src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
@@ -6,19 +6,17 @@ import com.zy.asrs.entity.BasCrnp; import com.zy.asrs.mapper.BasCrnpMapper; import com.zy.asrs.service.BasCrnpService; import com.zy.asrs.service.WrkMastService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @Slf4j @Service("basCrnpService") public class BasCrnpServiceImpl extends ServiceImpl<BasCrnpMapper, BasCrnp> implements BasCrnpService { @Value("${wms.count}") private Integer maxCount; @Autowired private WrkMastService wrkMastService; @Override public BasCrnp checkSiteStatus(Integer crnId) { BasCrnp crnp = this.selectById(crnId); src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -4,20 +4,14 @@ import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.core.exception.CoolException; import com.zy.asrs.entity.BasDevp; import com.zy.asrs.entity.TaskWrk; import com.zy.asrs.mapper.BasDevpMapper; import com.zy.asrs.service.BasDevpService; import com.zy.asrs.service.WrkMastService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @Service("basDevpService") public class BasDevpServiceImpl extends ServiceImpl<BasDevpMapper, BasDevp> implements BasDevpService { @Autowired private WrkMastService wrkMastService; @Override public List<Integer> getAvailableInSite() { @@ -59,9 +53,6 @@ } if(station.getWrkNo()!=null && station.getWrkNo()>0) { throw new CoolException(devpNo+"站点已有工作号"); } if(wrkMastService.getWorkingMast(devpNo)>0){ throw new CoolException(devpNo+"站点不能同时生成两笔入库工作档"); } } return station; src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
File was deleted src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -58,8 +58,6 @@ @Autowired private SlaveProperties slaveProperties; @Autowired private WrkMastMapper wrkMastMapper; @Autowired private LocMastService locMastService; @Autowired private BasCrnpService basCrnpService; @@ -93,8 +91,6 @@ private NotifyUtils notifyUtils; @Value("${wms.count}") private Integer maxCount; @Autowired private WrkMastService wrkMastService; @Value("${wms.url}") private String wmsUrl; @Value("${wms.inboundTaskApplyPath}") @@ -207,7 +203,30 @@ continue; } taskWrk = createTask1(result, barcode); String locNo = Utils.getLocNo(result.getRow(), result.getFloor(), result.getColumn()); LocMast locMast = locMastService.selectByLocNo(locNo); if (locMast == null) { log.info(locNo + "库位不存在"); continue; } Date now = new Date(); taskWrk = new TaskWrk(); taskWrk.setTaskNo(result.getTaskNo());//任务号 taskWrk.setWrkNo(commonService.getWorkNo(WorkNoType.PAKIN.type));//获取入库工作号 taskWrk.setStatus(TaskStatusType.RECEIVE.id);//任务状态：接收 taskWrk.setWrkSts(2);//2.设备上走 taskWrk.setCreateTime(now); taskWrk.setIoType(1);//任务类型 taskWrk.setIoPri(13);//优先级 taskWrk.setBarcode(barcode);//条码 taskWrk.setCrnNo(locMast.getCrnNo()); taskWrk.setTargetPoint(locNo); taskWrk.setStartPoint(String.valueOf(staProtocol.getStaNo())); if (!Cools.isEmpty(taskWrk.getTargetPoint())) { taskWrk.setOriginTargetPoint(taskWrk.getTargetPoint()); } if (!taskWrkService.insert(taskWrk)) { log.info("任务：" + result.getTaskNo() + "任务创建失败"); continue; @@ -229,7 +248,7 @@ customDataDto.setData(JSON.toJSONString(hashMap)); boolean notifyResult = notifyUtils.notify("task", 1, String.valueOf(taskWrk.getWrkNo()), taskWrk.getTaskNo(), NotifyMsgType.TASK_START, JSON.toJSONString(taskWrk), true, customDataDto); if(notifyResult) { taskWrk.setStatus(2); taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//任务派发 taskWrkService.updateById(taskWrk); } } @@ -836,26 +855,26 @@ // 有异常 if (latest == null) { if (crnProtocol.getAlarm() != null && crnProtocol.getAlarm() > 0) { WrkMast wrkMast = wrkMastMapper.selectById(crnProtocol.getTaskNo()); if (wrkMast == null) { TaskWrk taskWrk = taskWrkService.selectByWrkNo(crnProtocol.getTaskNo().intValue()); if (taskWrk == null) { continue; } BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm()); String errName = crnError == null ? String.valueOf(crnProtocol.getAlarm()) : crnError.getErrName(); BasErrLog basErrLog = new BasErrLog( null, // 编号 wrkMast.getWrkNo(), // 工作号 taskWrk.getWrkNo(), // 工作号 now, // 发生时间 null, // 结束时间 wrkMast.getWrkSts(), // 工作状态 wrkMast.getIoType(), // 入出库类型 taskWrk.getWrkSts().longValue(), // 工作状态 taskWrk.getIoType(), // 入出库类型 crn.getId(), // 堆垛机 null, // plc wrkMast.getLocNo(), // 目标库位 wrkMast.getStaNo(), // 目标站 wrkMast.getSourceStaNo(), // 源站 wrkMast.getSourceLocNo(), // 源库位 wrkMast.getBarcode(), // 条码 taskWrk.getTargetPoint(), // 目标库位 null, // 目标站 null, // 源站 taskWrk.getStartPoint(), // 源库位 taskWrk.getBarcode(), // 条码 (int) crnProtocol.getAlarm1(), // 异常码 errName, // 异常 1, // 异常情况 @@ -1002,40 +1021,6 @@ locMastService.updateById(locMast); } } } private TaskWrk createTask1(Result result, String barcode) { String locNo = Utils.getLocNo(result.getRow(), result.getFloor(), result.getColumn()); LocMast locMast = locMastService.selectByLocNo(locNo); if (locMast == null) { throw new CoolException("库位不存在"); } Date now = new Date(); TaskWrk taskWrk = new TaskWrk(); int workNo1 = commonService.getWorkNo(WorkNoType.PAKIN.type);//获取入库工作号 taskWrk.setTaskNo(result.getTaskNo());//任务号 taskWrk.setWrkNo(workNo1); taskWrk.setStatus(TaskStatusType.RECEIVE.id);//任务状态：接收 taskWrk.setCreateTime(now); taskWrk.setIoType(1);//任务类型 taskWrk.setIoPri(13);//优先级 taskWrk.setBarcode(barcode);//条码 taskWrk.setCrnNo(locMast.getCrnNo()); taskWrk.setTargetPoint(locNo); taskWrk.setStartPoint("116"); if (result.getAlley().equals("1")) { taskWrk.setCrnNo(1); } else { taskWrk.setCrnNo(2); } if (taskWrk.getIoType() == 1) { taskWrk.setWrkSts(2); if (!Cools.isEmpty(taskWrk.getTargetPoint())) { taskWrk.setOriginTargetPoint(taskWrk.getTargetPoint()); } } return taskWrk; } private TaskWrk createTask(GetWmsDto dto, String barcode) { src/main/java/com/zy/asrs/service/impl/MatCodeServiceImpl.java
File was deleted src/main/java/com/zy/asrs/service/impl/RowLastnoServiceImpl.java
File was deleted src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java
File was deleted src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java
File was deleted src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
File was deleted src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java
File was deleted src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
File was deleted src/main/java/com/zy/asrs/task/NotifyScheduler.java
@@ -91,27 +91,27 @@ if (notifyDto.getSendCustomData()) { //自定义消息格式 NotifyCustomDataDto customData = notifyDto.getCustomData(); apiLog.setUrl(customData.getUri() + customData.getPath()); apiLog.setRequest(customData.getData()); apiLog.setCreateTime(new Date()); response = new HttpHandler.Builder() .setUri(customData.getUri()) .setPath(customData.getPath()) .setJson(customData.getData()) .build() .doPost(); apiLog.setUrl(customData.getUri() + customData.getPath()); apiLog.setRequest(customData.getData()); apiLog.setCreateTime(new Date()); }else { apiLog.setUrl(notifyUri + notifyUriPath); apiLog.setRequest(JSON.toJSONString(notifyDto)); apiLog.setCreateTime(new Date()); response = new HttpHandler.Builder() .setUri(notifyUri) .setPath(notifyUriPath) .setJson(JSON.toJSONString(notifyDto)) .build() .doPost(); apiLog.setUrl(notifyUri + notifyUriPath); apiLog.setRequest(JSON.toJSONString(notifyDto)); apiLog.setCreateTime(new Date()); } apiLog.setResponse(response); src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -1,10 +1,6 @@ package com.zy.asrs.utils; import com.core.exception.CoolException; import com.zy.asrs.entity.LocDetl; import com.zy.asrs.entity.LocMast; import com.zy.asrs.entity.MatCode; import com.zy.asrs.entity.WrkDetl; import com.zy.common.model.LocTypeDto; /** @@ -13,64 +9,6 @@ public class VersionUtils { // 业务 ---------------------------------------------------------------------- public static void setWrkDetl(WrkDetl wrkDetl, MatCode matCode) { // wrkDetl.setMatNo(matCode.getMatNo()); // 物料编号 // wrkDetl.setMatName(matCode.getMatName()); // 物料描述 // wrkDetl.setLgnum(matCode.getStr2()); // 规格 // wrkDetl.setType(matCode.getStr5()); // 型号 // wrkDetl.setColor(matCode.getBarcode()); // 条码 // wrkDetl.setSupplier(matCode.getStr6()); // 批号 // wrkDetl.setWarehouse(matCode.getStr7()); // 单据编号 // wrkDetl.setBrand(matCode.getStr3()); // 品项数 // wrkDetl.setAltme(matCode.getStr1()); // 单位 // wrkDetl.setBname(matCode.getStr4()); // 客户名称 } public static void setWrkDetl(WrkDetl wrkDetl, LocDetl locDetl) { wrkDetl.setMatnr(locDetl.getMatnr()); // 产品编号 wrkDetl.setMaktx(locDetl.getMaktx()); // 产品描述 wrkDetl.setSpecs(locDetl.getSpecs()); // 规格 wrkDetl.setUnit(locDetl.getUnit()); // 单位 // wrkDetl.setSize(locDetl.getSize()); // 尺寸 wrkDetl.setColor(locDetl.getColor()); // 颜色 wrkDetl.setWeight(locDetl.getWeight()); // 单重 wrkDetl.setZpallet(locDetl.getZpallet()); // 托盘条码 } public static void setLocDetl(LocDetl locDetl, MatCode matCode) { // locDetl.setMatNo(matCode.getMatNo()); // 物料编号 // locDetl.setMatName(matCode.getMatName()); // 物料描述 // locDetl.setLgnum(matCode.getStr2()); // 规格 // locDetl.setType(matCode.getStr5()); // 型号 // locDetl.setColor(matCode.getBarcode()); // 条码 // locDetl.setSupplier(matCode.getStr6()); // 批号 // locDetl.setWarehouse(matCode.getStr7()); // 单据编号 // locDetl.setBrand(matCode.getStr3()); // 品项数 // locDetl.setAltme(matCode.getStr1()); // 单位 // locDetl.setBname(matCode.getStr4()); // 客户名称 } public static void setLocDetl(LocDetl locDetl, WrkDetl wrkDetl) { locDetl.setMatnr(wrkDetl.getMatnr()); // 产品编号 locDetl.setMaktx(wrkDetl.getMaktx()); // 产品描述 locDetl.setSpecs(wrkDetl.getSpecs()); // 规格 locDetl.setUnit(wrkDetl.getUnit()); // 单位 // locDetl.setSize(wrkDetl.getSize()); // 尺寸 locDetl.setColor(wrkDetl.getColor()); // 颜色 locDetl.setAnfme(wrkDetl.getAnfme()); // 数量 locDetl.setZpallet(wrkDetl.getZpallet()); // 托盘条码 } /** * 库位移转时类型检测 **/ public static void locMoveCheckLocType(LocMast sourceLoc, LocMast loc){ // 如果源库位是高库位，目标库位是低库位 // if (sourceLoc.getLocType1() == 2 && loc.getLocType1() == 1) { // throw new CoolException("高库位不能移转至低库位"); // } } /** * 库位移转时类型检测 src/main/java/com/zy/common/service/CommonService.java
@@ -1,29 +1,15 @@ package com.zy.common.service; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.Wrapper; import com.core.common.Arith; import com.core.common.Cools; import com.core.exception.CoolException; import com.zy.asrs.entity.*; import com.zy.asrs.service.*; import com.zy.asrs.utils.Utils; import com.zy.asrs.utils.VersionUtils; import com.zy.common.model.LocTypeDto; import com.zy.common.model.Shelves; import com.zy.common.model.StartupDto; import com.zy.core.properties.SlaveProperties; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; /** * 货架核心功能 * Created by vincent on 2020/6/11 */ @Slf4j @Service @@ -33,20 +19,6 @@ private TaskWrkService taskWrkService; @Autowired private WrkLastnoService wrkLastnoService; @Autowired private RowLastnoService rowLastnoService; @Autowired private BasCrnpService basCrnpService; @Autowired private StaDescService staDescService; @Autowired private BasDevpService basDevpService; @Autowired private LocMastService locMastService; @Autowired private SlaveProperties slaveProperties; @Autowired private LocDetlService locDetlService; /** * 生成工作号 wrkMk 0:入库 1 - 3000 ; 1:拣料/并板/盘点 3001 - 6000 ; 2: 出库 6001 -9000 ; 3:其他 9001 -9999 @@ -84,255 +56,6 @@ } } return workNo; } /** * 检索库位号 * @param whsType 类型 1:双深式货架 * @param staDescId 路径工作类型 * @param sourceStaNo 源站 * @param matNos 物料号集合 * @return locNo 检索到的库位号 */ @Transactional public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, int times) { StartupDto startupDto = new StartupDto(); // 生成工作号 int workNo = getWorkNo(0); switch (sourceStaNo) { case 202: whsType = 2; break; case 205: whsType = 1; break; case 126: whsType = 3; break; case 110: whsType = 4; break; case 301: whsType = 5; break; default: throw new CoolException("库位排号分配错误, 源站号：" + sourceStaNo); } RowLastno rowLastno = rowLastnoService.selectById(whsType); if (Cools.isEmpty(rowLastno)) { throw new CoolException("数据异常，请联系管理员"); } // ===============>>>> 开始执行 int curRow = rowLastno.getCurrentRow(); int sRow = rowLastno.getsRow(); int eRow = rowLastno.geteRow(); int crn_qty = rowLastno.getCrnQty(); int rowCount = eRow - sRow + 1; // 目标堆垛机号 int crnNo = 0; // 目标库位 LocMast locMast = null; // 靠近摆放规则 --- 同天同规格物料 if (!Cools.isEmpty(matNos)) { List<String> locNos = locDetlService.getSameDetlToday(matNos.get(0), sRow, eRow); for (String locNo : locNos) { if (Utils.isShallowLoc(slaveProperties, locNo)) { continue; } String shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo); // 检测目标库位是否为空库位 LocMast shallowLoc = locMastService.selectById(shallowLocNo); if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) { if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) { if (VersionUtils.locMoveCheckLocType(shallowLoc, locTypeDto)) { locMast = shallowLoc; crnNo = locMast.getCrnNo(); break; } } } } } // 靠近摆放规则 --- 空托 if (staDescId == 10) { List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow)); if (locMasts.size() > 0) { for (LocMast loc : locMasts) { if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) { continue; } String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo()); // 检测目标库位是否为空库位 LocMast shallowLoc = locMastService.selectById(shallowLocNo); if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) { if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) { locMast = shallowLoc; crnNo = locMast.getCrnNo(); break; } } } } } // 如果没有相近物料，则按规则轮询货架 if (null == locMast) { Shelves shelves = new Shelves(rowCount, crn_qty); // 1-4排 if (whsType == 1) { for (int i = 0; i < shelves.group; i ++) { curRow = shelves.start(curRow); if (curRow < 0) { throw new CoolException("检索库位失败，请联系管理员"); } Integer crnNo1 = shelves.get(curRow); if (basCrnpService.checkSiteError(crnNo1, true)) { crnNo = crnNo1; break; } } // 5-8排 } else if (whsType == 2) { curRow = curRow - 4; for (int i = 0; i < shelves.group; i ++) { curRow = shelves.start(curRow); if (curRow < 0) { throw new CoolException("检索库位失败，请联系管理员"); } Integer crnNo1 = shelves.get(curRow); if (basCrnpService.checkSiteError(crnNo1 + 1, true)) { // 偏移量补偿 curRow = curRow + 4; crnNo = crnNo1 + 1; break; } } // 126空板入 1-8排 } else { for (int i = 0; i < shelves.group; i ++) { curRow = shelves.start(curRow); if (curRow < 0) { throw new CoolException("检索库位失败，请联系管理员"); } Integer crnNo1 = shelves.get(curRow); if (basCrnpService.checkSiteError(crnNo1, true)) { crnNo = crnNo1; break; } } } } if (crnNo == 0) { throw new CoolException("没有可用的堆垛机"); } // 获取目标站 Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>() .eq("type_no", staDescId) .eq("stn_no", sourceStaNo) .eq("crn_no", crnNo); StaDesc staDesc = staDescService.selectOne(wrapper); if (Cools.isEmpty(staDesc)) { log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo); throw new CoolException("入库路径不存在"); } BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn()); if (!staNo.getAutoing().equals("Y")) { throw new CoolException("目标站"+staDesc.getCrnStn()+"不可用"); } // 更新库位排号 rowLastno.setCurrentRow(curRow); rowLastnoService.updateById(rowLastno); // 开始查找库位 ==============================>> // 1.当检索库排为浅库位排时，优先寻找当前库排的深库位排 if (locMast == null) { if (Utils.isShallowLoc(slaveProperties, curRow)) { Integer deepRow = Utils.getDeepRow(slaveProperties, curRow); locMast = locMastService.queryFreeLocMast(deepRow, locTypeDto.getLocType1()); // 因库位移转、需预留空库位 if (!locMastService.checkEmptyCount(locMast)) { locMast = null; } } if (Cools.isEmpty(locMast)) { locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1()); // 因库位移转、需预留空库位 if (!locMastService.checkEmptyCount(locMast)) { locMast = null; } // 目标库位 ===>> 浅库位， 则校验其深库位是否为 F D X if (null != locMast && Utils.isShallowLoc(slaveProperties, locMast.getLocNo())) { LocMast deepLoc = locMastService.selectById(Utils.getDeepLoc(slaveProperties, locMast.getLocNo())); if (!deepLoc.getLocSts().equals("F") && !deepLoc.getLocSts().equals("D") && !deepLoc.getLocSts().equals("X")) { locMast = null; } } // 目标库位 ===>> 深库位， 则校验其浅库位是否为 O if (null != locMast && Utils.isDeepLoc(slaveProperties, locMast.getLocNo())) { LocMast shallowLoc = locMastService.selectById(Utils.getShallowLoc(slaveProperties, locMast.getLocNo())); if (!shallowLoc.getLocSts().equals("O")) { locMast = null; } } } } // 2.库位当前所属尺寸无空库位时，调整尺寸参数，向上兼容检索库位 if (Cools.isEmpty(locMast)) { // 当前巷道无空库位时，递归调整至下一巷道，检索全部巷道无果后，跳出递归 if (times < rowCount) { times = times + 1; return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, times); } else { times = 0; } // 轻货物找轻库位为空时，可以去找重库位仓 if (locTypeDto.getLocType1() == 1) { locTypeDto.setLocType1((short) 2); return getLocNo(null, staDescId, sourceStaNo, matNos, locTypeDto, times); } log.error("系统没有空库位！！！ 尺寸规格： {}， 轮询次数：{}", JSON.toJSONString(locTypeDto), times); throw new CoolException("没有空库位"); } String locNo = locMast.getLocNo(); // 返回dto startupDto.setWorkNo(workNo); startupDto.setCrnNo(crnNo); startupDto.setSourceStaNo(sourceStaNo); startupDto.setStaNo(staNo.getDevNo()); startupDto.setLocNo(locNo); return startupDto; } public static void main(String[] args) { System.out.println(Arith.remainder(1, 4)); System.out.println("0200201".substring(0, 2)); String locNo = "0800201"; int row = Integer.parseInt(locNo.substring(0, 2)); double remainder = Arith.remainder(row, 4); int targetRow; if (remainder == 1) { // 得到当前库位的外围库位 targetRow = row + 1; } else if (remainder == 0) { // 得到当前库位的内围库位 targetRow = row - 1; } else { return; } String zerofill = zerofill(String.valueOf(targetRow), 2)+locNo.substring(2); System.out.println(zerofill); } public static String zerofill(String msg, Integer count) { src/main/java/com/zy/common/service/WmsService.java
File was deleted src/main/java/com/zy/core/thread/LedThread.java
@@ -1,12 +1,9 @@ package com.zy.core.thread; import com.alibaba.fastjson.JSON; import com.core.common.Cools; import com.core.common.SpringUtils; import com.zy.asrs.entity.CommandInfo; import com.zy.asrs.service.CommandInfoService; import com.zy.asrs.service.DeviceErrorService; import com.zy.common.entity.Parameter; import com.zy.common.model.MatDto; import com.zy.core.Slave; import com.zy.core.ThreadHandler; @@ -28,7 +25,6 @@ import onbon.bx05.utils.DisplayStyleFactory; import java.awt.*; import java.util.Date; import java.util.HashSet; import java.util.List; import java.util.Set; src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -9,17 +9,12 @@ import com.core.common.DateUtils; import com.core.common.SpringUtils; import com.core.exception.CoolException; import com.zy.asrs.domain.enums.TaskStatusType; import com.zy.asrs.entity.BasDevp; import com.zy.asrs.entity.CommandInfo; import com.zy.asrs.entity.CommandInfoLog; import com.zy.asrs.entity.TaskWrk; import com.zy.asrs.service.*; import com.zy.core.DevpThread; import com.zy.core.cache.MessageQueue; import com.zy.core.cache.OutputQueue; import com.zy.core.cache.SlaveConnection; import com.zy.core.enums.CommandStatusType; import com.zy.core.enums.IoModeType; import com.zy.core.enums.SlaveType; import com.zy.core.model.DevpSlave; @@ -49,12 +44,11 @@ private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>(); private short heartBeatVal = 1; public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{ add(100);add(101);add(102);add(103);add(104); add(105);add(106);add(107);add(108);add(109); add(110);add(111);add(112);add(113);add(114); add(115);add(116);add(117);add(118);add(119); add(120);add(121);add(122);add(123);add(124); add(125);add(1001);add(1002);add(1003);add(1004); add(101);add(102);add(103);add(104); add(105);add(106);add(107);add(108); add(201);add(202);add(203);add(204);add(205); add(206);add(207);add(208);add(209);add(210); add(211);add(212); }}; /*public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{ add(200);add(201);add(202);add(203); src/main/resources/mapper/LocDetlMapper.xml
File was deleted src/main/resources/mapper/MatCodeMapper.xml
File was deleted src/main/resources/mapper/RowLastnoMapper.xml
File was deleted src/main/resources/mapper/WaitPakinMapper.xml
File was deleted src/main/resources/mapper/WrkDetlMapper.xml
File was deleted src/main/resources/mapper/WrkMastMapper.xml
File was deleted src/main/webapp/static/wms/js/locMast/locMast.js
@@ -28,7 +28,7 @@ // ,{field: 'ctnType', align: 'center',title: ''} // ,{field: 'locSts', align: 'center',title: ''} // ,{field: 'sheetNo', align: 'center',title: ''} // ,{field: 'crnNo', align: 'center',title: '堆垛机号'} ,{field: 'crnNo', align: 'center',title: '堆垛机号'} ,{field: 'row1', align: 'center',title: '排', sort:true} ,{field: 'bay1', align: 'center',title: '列', sort:true} ,{field: 'lev1', align: 'center',title: '层', sort:true} src/main/webapp/views/locMast/locMast.html
@@ -65,15 +65,6 @@ <input class="layui-input" type="text" name="barcode" placeholder="托盘码" autocomplete="off"> </div> </div> <div class="layui-inline"> <div class="layui-input-inline"> <select class="layui-input" id="loc_type1" name="loc_type1" autocomplete="off"> <option value>选择桶类型</option> <option value="1">油桶</option> <option value="2">净桶</option> </select> </div> </div> <!-- 待添加 --> <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block"> <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">搜索</button>
