src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -12,7 +12,6 @@ import com.zy.asrs.domain.vo.*; import com.zy.asrs.entity.BasDevp; import com.zy.asrs.entity.WrkMast; import com.zy.asrs.mapper.LocMastMapper; import com.zy.asrs.service.BasDevpService; import com.zy.asrs.service.WrkMastService; import com.zy.common.CodeRes; @@ -48,8 +47,6 @@ private WrkMastService wrkMastService; @Autowired private BasDevpService basDevpService; @Autowired private LocMastMapper locMastMapper; @PostMapping("/system/running/status") @ManagerAuth(memo = "系统运行状态") @@ -183,8 +180,6 @@ vo.setIoType(wrkMast.getIoType$()); // 入出库类型 vo.setSourceStaNo(wrkMast.getSourceStaNo$()); vo.setStaNo(wrkMast.getStaNo$()); vo.setSourceLocNo(wrkMast.getSourceLocNo$()); vo.setLocNo(wrkMast.getLocNo$()); } }
@@ -308,9 +308,6 @@ Double xDuration = 0.0D; Double yDuration = 0.0D; // ledContent = "ask的模块萨满大算了萨满大了\n 是窘境到埃及嗲家嗲\n 萨达姆打开萨满大凯撒麦当劳萨满大老师"; return R.ok( Cools.add("xSpeed", Arith.multiplys(1, Math.abs(xSpeed), 1)) // 行走速度 .add("ySpeed", Arith.multiplys(1, Math.abs(ySpeed), 1)) // 升降速度 src/main/java/com/zy/asrs/controller/RgvController.java
@@ -2,7 +2,6 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.annotations.ManagerAuth; import com.core.common.Arith; import com.core.common.R; import com.core.exception.CoolException; import com.zy.asrs.domain.enums.RgvStatusType; @@ -11,11 +10,8 @@ import com.zy.asrs.entity.*; import com.zy.asrs.mapper.BasRgvErrMapper; import com.zy.asrs.service.BasRgvService; import com.zy.asrs.service.LocMastService; import com.zy.asrs.service.WrkMastService; import com.zy.asrs.service.impl.MainServiceImpl; import com.zy.asrs.utils.VersionUtils; import com.zy.core.Slave; import com.zy.core.cache.MessageQueue; import com.zy.core.cache.OutputQueue; import com.zy.core.cache.SlaveConnection; @@ -28,10 +24,8 @@ import com.zy.core.model.protocol.RgvProtocol; import com.zy.core.properties.SlaveProperties; import com.zy.core.thread.RgvThread; import com.zy.core.thread.ScaleThread; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -60,8 +54,6 @@ private BasRgvService basRgvService; @Autowired private MainServiceImpl mainService; @Autowired private LocMastService locMastService; @PostMapping("/table/rgv/state") @ManagerAuth(memo = "RGV信息表") src/main/java/com/zy/asrs/entity/BasJar.java
File was deleted src/main/java/com/zy/asrs/entity/BasJarMast.java
File was deleted src/main/java/com/zy/asrs/entity/BasJarMastStatus.java
File was deleted src/main/java/com/zy/asrs/entity/LocDetl.java
File was deleted src/main/java/com/zy/asrs/entity/LocMast.java
File was deleted src/main/java/com/zy/asrs/entity/MatCode.java
File was deleted src/main/java/com/zy/asrs/entity/RgvNode.java
File was deleted src/main/java/com/zy/asrs/entity/RgvOneSign.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/WrkMast.java
@@ -371,15 +371,6 @@ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.wrkDate); } public String getLocNo$(){ LocMastService service = SpringUtils.getBean(LocMastService.class); LocMast locMast = service.selectById(this.locNo); if (!Cools.isEmpty(locMast)){ return String.valueOf(locMast.getLocNo()); } return null; } public String getStaNo$(){ BasDevpService service = SpringUtils.getBean(BasDevpService.class); BasDevp basDevp = service.selectById(this.staNo); @@ -394,15 +385,6 @@ BasDevp basDevp = service.selectById(this.sourceStaNo); if (!Cools.isEmpty(basDevp)){ return String.valueOf(basDevp.getDevNo()); } return null; } public String getSourceLocNo$(){ LocMastService service = SpringUtils.getBean(LocMastService.class); LocMast locMast = service.selectById(this.sourceLocNo); if (!Cools.isEmpty(locMast)){ return String.valueOf(locMast.getLocNo()); } return null; } src/main/java/com/zy/asrs/entity/WrkMastCrn.java
File was deleted src/main/java/com/zy/asrs/entity/WrkMastExecute.java
File was deleted src/main/java/com/zy/asrs/entity/WrkMastSplitTwin.java
File was deleted src/main/java/com/zy/asrs/entity/WrkMastSta.java
File was deleted src/main/java/com/zy/asrs/mapper/BasJarMapper.java
File was deleted src/main/java/com/zy/asrs/mapper/BasJarMastMapper.java
File was deleted src/main/java/com/zy/asrs/mapper/BasJarMastStatusMapper.java
File was deleted src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
File was deleted src/main/java/com/zy/asrs/mapper/LocMastMapper.java
File was deleted src/main/java/com/zy/asrs/mapper/MatCodeMapper.java
File was deleted src/main/java/com/zy/asrs/mapper/RgvOneSignMapper.java
File was deleted src/main/java/com/zy/asrs/mapper/WaitPakinMapper.java
File was deleted src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
File was deleted src/main/java/com/zy/asrs/mapper/WrkMastCrnMapper.java
File was deleted src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java
File was deleted src/main/java/com/zy/asrs/mapper/WrkMastSplitTwinMapper.java
File was deleted src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java
File was deleted src/main/java/com/zy/asrs/service/LocDetlService.java
File was deleted src/main/java/com/zy/asrs/service/LocMastService.java
File was deleted src/main/java/com/zy/asrs/service/MatCodeService.java
File was deleted src/main/java/com/zy/asrs/service/WrkDetlService.java
File was deleted src/main/java/com/zy/asrs/service/WrkMastExecuteService.java
File was deleted src/main/java/com/zy/asrs/service/WrkMastSplitTwinService.java
File was deleted src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
File was deleted src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
File was deleted src/main/java/com/zy/asrs/service/impl/MatCodeServiceImpl.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/WrkMastExecuteServiceImpl.java
File was deleted src/main/java/com/zy/asrs/service/impl/WrkMastSplitTwinServiceImpl.java
File was deleted src/main/java/com/zy/asrs/task/escalationParam/ScaleEscalationParam.java
@@ -1,12 +1,6 @@ package com.zy.asrs.task.escalationParam; import com.zy.asrs.entity.WrkDetl; import com.zy.asrs.entity.WrkMast; import lombok.Data; import java.util.ArrayList; import java.util.Date; import java.util.List; /* * Created by Monkey D. Luffy on 2023.07.19 src/main/java/com/zy/asrs/task/escalationParam/StaEscalationParam.java
@@ -1,12 +1,6 @@ package com.zy.asrs.task.escalationParam; import com.zy.asrs.entity.WrkDetl; import com.zy.asrs.entity.WrkMast; import lombok.Data; import java.util.ArrayList; import java.util.Date; import java.util.List; /* * Created by Monkey D. Luffy on 2023.07.19 src/main/java/com/zy/asrs/utils/VersionUtils.java
File was deleted src/main/java/com/zy/common/model/MatDto.java
@@ -1,6 +1,5 @@ package com.zy.common.model; import com.zy.asrs.entity.WrkDetl; import lombok.Data; /** @@ -49,23 +48,5 @@ this.maknx = maknx; this.count = count; this.specs = specs; } public MatDto(WrkDetl wrkDetl) { try{ this.matNo = wrkDetl.getMatnr(); this.matnr = wrkDetl.getMatnr(); this.maknx = wrkDetl.getMaktx(); this.specs = wrkDetl.getSpecs(); this.batch = wrkDetl.getBatch(); this.model = wrkDetl.getModel(); this.price = wrkDetl.getPrice().toString(); // this.juanNo = wrkDetl.getSku(); this.count = wrkDetl.getAnfme(); this.weight = wrkDetl.getWeight(); this.volume = wrkDetl.getVolume(); this.orderNo = wrkDetl.getOrderNo(); } catch (Exception e){ System.out.println("异常MatDto68"); } } } src/main/java/com/zy/common/service/CommonService.java
@@ -1,25 +1,13 @@ 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; /** * 货架核心功能 @@ -33,18 +21,6 @@ private WrkMastService wrkMastService; @Autowired private WrkLastnoService wrkLastnoService; @Autowired private RowLastnoService rowLastnoService; @Autowired private StaDescService staDescService; @Autowired private BasDevpService basDevpService; @Autowired private LocMastService locMastService; @Autowired private SlaveProperties slaveProperties; @Autowired private LocDetlService locDetlService; /** * 生成工作号 src/main/java/com/zy/common/service/WmsService.java
@@ -1,7 +1,6 @@ package com.zy.common.service; import com.alibaba.fastjson.JSON; import com.zy.asrs.entity.WaitPakin; import com.zy.common.utils.HttpHandler; import com.zy.core.properties.SystemProperties; import lombok.extern.slf4j.Slf4j; @@ -19,32 +18,5 @@ @Slf4j @Service public class WmsService { public boolean fullStorePutStart(String barcode, Integer sourceStaNo, List<WaitPakin> waitPakins) { try { Map<String, Object> param = new HashMap<>(); param.put("barcode", barcode); param.put("devpNo", sourceStaNo); List<Map<String, Object>> list = new ArrayList<>(); for (WaitPakin waitPakin : waitPakins) { Map<String, Object> mat = new HashMap<>(); mat.put("matNo", waitPakin.getMatnr()); mat.put("count", waitPakin.getAnfme()); list.add(mat); } param.put("list", list); String response = new HttpHandler.Builder() .setUri(SystemProperties.WMS_URL) .setPath("/full/store/put/start") .setJson(JSON.toJSONString(param)) .build() .doPost(); } catch (IOException e) { } return true; } } src/main/java/com/zy/common/utils/RgvUtils.java
File was deleted src/main/java/com/zy/core/ServerBootstrap.java
@@ -29,8 +29,6 @@ @Autowired private MainProcess mainProcess; int CRN_COUNT = 0; /** * PostConstruct会在加载servlet的时候运行一次 src/main/java/com/zy/core/model/CrnSlave.java
File was deleted src/main/java/com/zy/core/model/JarSlave.java
File was deleted src/main/java/com/zy/core/model/protocol/JarProtocol.java
File was deleted src/main/java/com/zy/core/properties/SlaveProperties.java
@@ -22,8 +22,6 @@ @ConfigurationProperties(prefix = "wcs-slave") public class SlaveProperties{ private List<CrnSlave> crn = new ArrayList<>(); private List<RgvSlave> rgv = new ArrayList<>(); private List<DevpSlave> devp = new ArrayList<>(); @@ -35,8 +33,6 @@ private List<Slave> scale = new ArrayList<>(); private List<Slave> car = new ArrayList<>(); private List<JarSlave> jar = new ArrayList<>(); private List<SteSlave> Ste = new ArrayList<>();
File was deleted src/main/resources/mapper/LocMastMapper.xml
File was deleted src/main/resources/mapper/MatCodeMapper.xml
File was deleted src/main/resources/mapper/RgvOneSignMapper.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/WrkMastCrnMapper.xml
File was deleted src/main/resources/mapper/WrkMastExecuteMapper.xml
File was deleted src/main/resources/mapper/WrkMastSplitTwinMapper.xml
File was deleted src/main/resources/mapper/WrkMastStaMapper.xml
File was deleted src/main/webapp/static/css/crn.css
File was deleted src/main/webapp/views/crn.html
File was deleted src/main/webapp/views/index.html
@@ -15,12 +15,7 @@ <div class="nav"> <ul class="cl-effect-4"> <li><a id="console" onclick="nav(this.id)" class="nav-select" href="#">一楼一区</a></li> <li><a id="console12" onclick="nav(this.id)" class="nav-select" href="#">一楼二区</a></li> <li><a id="console21" onclick="nav(this.id)" class="nav-select" href="#">二楼一区</a></li> <li><a id="console22" onclick="nav(this.id)" class="nav-select" href="#">二楼二区</a></li> <li><a id="console23" onclick="nav(this.id)" class="nav-select" href="#">二楼三区</a></li> <li><a id="pipeline" onclick="nav(this.id)" class="nav-unselect" href="#">输送设备</a></li> <li><a id="crn" onclick="nav(this.id)" class="nav-unselect" href="#">堆垛机</a></li> <li><a id="rgv" onclick="nav(this.id)" class="nav-unselect" href="#">RGV</a></li> <li><a id="ste" onclick="nav(this.id)" class="nav-unselect" href="#">穿梭车</a></li> </ul>
