Browse Source

init --金川镍盐

k 2 years ago
parent
commit
6e2a9e7727

+ 1 - 202
README.md

@@ -1,202 +1 @@
-# PDA入库接口
-
-```java
-@Api("入库")
-@RestController
-@RequestMapping("/pda/asn")
-public class PdaDocAsnController {
-
-
-    @Autowired
-    private IBusinessService businessService;
-    @Autowired
-    private IWmsDocAsnHeaderService wmsDocAsnHeaderService;
-
-    @ApiOperation("入库位->接驳位任务下发")
-    @PostMapping("inToTran")
-    public AjaxResult inToTran(@RequestBody DocAsnHeader docAsnHeader) {
-    }
-```
-
-# PDA出库接口
-
-```java
-@Api("出库")
-@RestController
-@RequestMapping("/pda/so")
-public class PdaDocSoController {
-
-
-    @Autowired
-    private IBusinessService businessService;
-    @Autowired
-    private IWmsDocOrderHeaderService wmsDocOrderHeaderService;
-
-    @ApiOperation("出库位->接驳位任务下发")
-    @PostMapping("outToTran")
-    public AjaxResult outToTran(@RequestBody DocOrderHeader docOrderHeader) {
-    }
-```
-
-## 出库获取物料列表
-
-```java
-@RestController
-@RequestMapping("/pda/inv")
-public class PdaInvLotLocIdController {
-
-    @Autowired
-    private IInvLotLocIdService invLotLocIdService;
-    @Autowired
-    private InvLotLocIdMapper invLotLocIdMapper;
-
-
-    @GetMapping("/getSku")
-    public AjaxResult getSku() {
-        InvLocIdSearchFrom invLocIdSearchFrom = new InvLocIdSearchFrom();
-        invLocIdSearchFrom.setZoneId(Constant.ZONE_TYPE.STORAGE.getValue().toString());
-        List<InvLotLocIdLotattVO> invLotLocIdLotattVOList = invLotLocIdMapper.selectInvLocIdSkuListGroupBy(invLocIdSearchFrom);
-        return AjaxResult.success("", invLotLocIdLotattVOList);
-    }
-```
-
-# PDA质检接口
-
-## 获取质检批次接口
-
-```java
-@RestController
-@RequestMapping("/pda/qc")
-public class PdaDocQcController {
-
-
-    @Autowired
-    private IDocQcHeaderService iDocQcHeaderService;
-
-    @Autowired
-    private IDocQcDetailsService iDocQcDetailsService;
-
-
-    /**
-     * 获取质检列表(根据sku)
-     *
-     * @return
-     */
-    @GetMapping("/getQcList")
-    public AjaxResult getQcListByInvLotLocId(String sku) {
-        List<DocQcListVo> qcListByInvLotLocId = iDocQcHeaderService.getQcListByInvLotLocId(sku);
-        if (qcListByInvLotLocId.size() == 0) {
-            return AjaxResult.error("没有需要质检的库存!");
-        }
-        return AjaxResult.success("获取成功!", qcListByInvLotLocId);
-    }
-}
-```
-
-## 质检提交接口
-
-```java
-/**
- * 质检提交
- *
- * @param sku     产品代码
- * @param batchNo 批号
- * @param status  质量状态
- * @return
- */
-@Log(title = "PDA质检提交(根据库存质检)", businessType = BusinessType.UPDATE)
-@PostMapping("/submit")
-public AjaxResult qcSubmit(String sku, String batchNo, String status) {
-
-    return iDocQcHeaderService.qcSubmit(sku, batchNo, status);
-}
-```
-
-# 所有配置任务生成接口
-
-```java
-public interface IBusinessService {
-
-
-    /**
-     * AGV呼叫业务
-     *
-     * @param flowId
-     * @param agvCallDTO
-     * @return
-     */
-    AjaxResult agvCall(Long flowId, AgvCallDTO agvCallDTO);
-}
-```
-
-
-
-# 定时任务接口-RFID-按钮盒-自动门等任务
-
-```java
-@Component
-public class StartService implements CommandLineRunner {
-
-    @Autowired
-    private IBusinessService businessService;
-    @Autowired
-    private InitTaskConfig initTaskConfig;
-    @Autowired
-    private AciService aciService;
-    @Autowired
-    private AutoTranSitTask autoTranSitTask;
-    @Autowired
-    private AutoRfidReaderTask autoRfidReaderTask;
-    @Autowired
-    private AutoButtonBoxTask autoButtonBoxTask;
-
-    @Override
-    public void run(String... args) throws Exception {
-        //自动下发任务
-        if (initTaskConfig.getAutoSend()) {
-            Thread thread = new Thread(new AutoTaskThread(businessService));
-            thread.start();
-        }
-
-        //ndc下发
-        if (initTaskConfig.getAciService()) {
-            Thread thread = new Thread(new AciServiceThread(aciService));
-            thread.start();
-        }
-    }
-
-
-    /**
-     * 自动接驳位任务
-     * 1.扫描有货的接驳位,如果标记是ASN则进行自动入库
-     * 2.扫描有货的接驳位,如果标记是SO则进行自动出库
-     */
-    public void autoTranSitTask() {
-        autoTranSitTask.run();
-    }
-
-    /**
-     * 自动RFID读取任务(墙外)
-     * 1.带有标签的人工叉车靠近RFID阅读器,开启自动门
-     * 2.带有标签的人工叉车离开RFID阅读器,关闭自动门
-     */
-    public void autoRfidReaderTask() {
-        autoRfidReaderTask.run();
-    }
-
-    /**
-     * 自动RFID读取任务(室内)
-     */
-    public void autoRfidReaderTask01() {
-        autoRfidReaderTask.run01();
-    }
-
-    /**
-     * 自动按钮盒监控任务
-     * 1.人工卸完货之后按下冲边按钮,触发冲边搬运任务
-     * 2.人工卸完货之后按下硫化按钮,触发硫化搬运任务
-     */
-    public void autoButtonBoxTask() {
-        autoButtonBoxTask.run();
-    }
-```
+# 金川镍盐

+ 0 - 64
ruoyi-admin/src/main/java/com/ruoyi/init/StartService.java

@@ -51,68 +51,4 @@ public class StartService implements CommandLineRunner {
             thread.start();
         }
     }
-
-
-    /**
-     * 自动接驳位任务
-     * 1.扫描有货的接驳位,如果标记是ASN则进行自动入库
-     * 2.扫描有货的接驳位,如果标记是SO则进行自动出库
-     */
-    public void autoTranSitTask() {
-        autoTranSitTask.run();
-    }
-
-    /**
-     * 自动RFID读取任务(墙外)
-     * 1.带有标签的人工叉车靠近RFID阅读器,开启自动门
-     * 2.带有标签的人工叉车离开RFID阅读器,关闭自动门
-     */
-    public void autoRfidReaderTask() {
-        autoRfidReaderTask.run();
-    }
-
-    /**
-     * 自动RFID读取任务(室内)
-     */
-    public void autoRfidReaderTask01() {
-        autoRfidReaderTask.run01();
-    }
-
-    /**
-     * 自动按钮盒监控任务
-     * 1.人工卸完货之后按下冲边按钮,触发冲边搬运任务
-     * 2.人工卸完货之后按下硫化按钮,触发硫化搬运任务
-     */
-    public void autoButtonBoxTask() {
-        autoButtonBoxTask.run();
-    }
-
-    /**
-     * 空托盘入库测试
-     *
-     * @param locationFrom
-     */
-    public void emptyPalletStorage(String locationFrom) {
-        // 验证起始点是否空闲
-        Boolean isIdle = baseLocationInfoService.verifyLocationIsIdle(locationFrom,Constant.WAREHOUSE_ID);
-        if (!isIdle) {
-            return;
-        }
-        // 下发任务
-        AgvCallDTO agvCallDTO = new AgvCallDTO();
-        agvCallDTO.setWarehouseId(Constant.WAREHOUSE_ID);
-        agvCallDTO.setLocationFrom(locationFrom);
-        List<AgvCallItemDTO> agvCallItemDTOList = new ArrayList<>();
-        AgvCallItemDTO agvCallItemDTO = new AgvCallItemDTO();
-        agvCallItemDTO.setSku("EMPTY_TRAY");
-        agvCallItemDTO.setQty(1d);
-        agvCallItemDTO.setWeight(1d);
-        LotattDTO lotattDTO = new LotattDTO();
-        lotattDTO.setLotatt01("EMPTY_TRAY");
-        lotattDTO.setLotatt05("HG");
-        agvCallItemDTO.setLotattDTO(lotattDTO);
-        agvCallItemDTOList.add(agvCallItemDTO);
-        agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
-        businessService.agvCall(Constant.IN_TRAN_FLOW_ID, agvCallDTO);
-    }
 }

+ 1 - 39
ruoyi-admin/src/main/resources/application-dev.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://47.101.169.124:3306/warewms-hualan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://47.101.169.124:3306/warewms-jnmc-jinco?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: warewms
                 password: warewms123
             # 从库数据源
@@ -67,41 +67,3 @@ init-task:
     autosend: false # 自动下发任务
     aciservice: false # ndc通讯
 
-modbus:
-    tcp-master:
-        first: # 自动门(靠马路)
-            open: false
-            host: 192.168.42.201
-            port: 9000
-        second: # 自动门(靠里面)
-            open: false
-            host: 192.168.42.202
-            port: 9000
-        third: # 按钮盒
-            open: false
-            host: 192.168.42.205
-            port: 9000
-        fourth: # 充电机(三向车)
-            open: false
-            host: 192.168.42.208
-            port: 8899
-        fifth: # 充电机(迷你堆垛)
-            open: false
-            host: 192.168.42.209
-            port: 8899
-
-# 注意:这玩意只能跑在window上
-rfid:
-  first:
-      open: false
-      host: 169.168.42.203
-      port: 5084
-      number-of-tags: 3 # 一次读取标签的数量
-      timeout-milliseconds: 5000
-  second: # 靠里面
-      open: false
-      host: 192.168.42.204
-      port: 5084
-      number-of-tags: 3 # 一次读取标签的数量
-      timeout-milliseconds: 5000
-

+ 0 - 38
ruoyi-admin/src/main/resources/application-prod.yml

@@ -67,41 +67,3 @@ init-task:
     autosend: true # 自动下发任务
     aciservice: true # ndc通讯
 
-modbus:
-    tcp-master:
-        first: # 自动门(靠马路)
-            open: true
-            host: 192.168.42.201
-            port: 9000
-        second: # 自动门(靠里面)
-            open: true
-            host: 192.168.42.202
-            port: 9000
-        third: # 按钮盒
-            open: true
-            host: 192.168.42.205
-            port: 9000
-        fourth: # 充电机(三向车)
-            open: true
-            host: 192.168.42.208
-            port: 8899
-        fifth: # 充电机(迷你堆垛)
-            open: true
-            host: 192.168.42.209
-            port: 8899
-
-
-rfid:
-    first: # 靠马路
-        open: true
-        host: 192.168.42.203
-        port: 5084
-        number-of-tags: 3 # 一次读取标签的数量
-        timeout-milliseconds: 5000
-    second: # 靠里面
-        open: true
-        host: 192.168.42.204
-        port: 5084
-        number-of-tags: 3 # 一次读取标签的数量
-        timeout-milliseconds: 5000
-

+ 1 - 1
ruoyi-admin/src/main/resources/application.yml

@@ -37,7 +37,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: prod
+    active: dev
   # 文件上传
   servlet:
     multipart:

+ 2 - 2
warewms-ams/src/main/java/com/ruoyi/ams/task/service/impl/WcsTaskServiceImpl.java

@@ -346,7 +346,7 @@ public class WcsTaskServiceImpl implements IWcsTaskService {
                             // 将中间缓存位库存移动到终点
                             moveMiddleCacheToDestination(wcsTask);
                             // 修改库存标识标识 因为接驳位可以出库也可以入库 所以需要标识当前接驳位的库存是入库还是出库
-                            updateInvAsnSoMarking(wcsTask);
+//                            updateInvAsnSoMarking(wcsTask);
                             //释放redis锁
                             if (!StringUtils.isEmpty(wcsTask.getExt8())) {
                                 redisCache.unlockCacheObject(Long.parseLong(wcsTask.getExt8()));
@@ -386,7 +386,7 @@ public class WcsTaskServiceImpl implements IWcsTaskService {
                             // 将中间缓存位库存移动到终点
                             moveMiddleCacheToDestination(wcsTask);
                             // 修改库存标识标识 因为接驳位可以出库也可以入库 所以需要标识当前接驳位的库存是入库还是出库
-                            updateInvAsnSoMarking(wcsTask);
+//                            updateInvAsnSoMarking(wcsTask);
                             //释放redis锁
                             if (!StringUtils.isEmpty(wcsTask.getExt8())) {
                                 redisCache.unlockCacheObject(Long.parseLong(wcsTask.getExt8()));