金银花搭建

warewms-ams/src/main/java/com/warewms/ams/ndc/dto/AmsTaskDTO.java

@@ -1,5 +1,6 @@
 package com.warewms.ams.ndc.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.warewms.common.annotation.Excel;
 import lombok.Data;
 
@@ -98,16 +99,14 @@ public class AmsTaskDTO implements Serializable {
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String callbackurl;
 
-    /**
-     * $column.columnComment
-     */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date addtime;
 
     /**
      * $column.columnComment
      */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    
     private String addwho;
 
     /**

warewms-ams/src/main/java/com/warewms/ams/ndc/service/StatusUpdateService.java

@@ -16,5 +16,5 @@ public interface StatusUpdateService {
      * @param id    amstaskid
      * @param carNo 车号（只有取货完成后才会有反馈）
      */
-    void updateStatus(Long id, Integer carNo);
+    void updateStatus(Long id, Integer carNo, Integer state);
 }

warewms-ams/src/main/java/com/warewms/ams/ndc/service/impl/AmsTaskServiceImpl.java

@@ -180,8 +180,12 @@ public class AmsTaskServiceImpl extends CrudServiceImpl<AmsTaskMapper, AmsTask,
         amsTask.setStFrom(convertLocation(amsTaskInsertDTO.getLocationFrom()));
         boolean isExist = redisCache.checkIsExist(AmsConstant.WMS_CORRESPOND_AGV_STATION_KEY.concat(amsTaskInsertDTO.getLocationFrom()))
                 && redisCache.checkIsExist(AmsConstant.WMS_CORRESPOND_AGV_STATION_KEY.concat(amsTaskInsertDTO.getLocationTo()));
+        //1. 如果起点和终点都存在缓存,则为分拣任务 目标点转换为agv对应站点
+        //2. 如果起点和终点只有一个存在缓存 则为入库/出库任务 任务目标点转换为接驳位 入库任务为堆垛车接驳位 出库任务为三向车接驳位
         amsTask.setStTo(isExist ? convertLocation(amsTaskInsertDTO.getLocationTo()) : getCacheLocation(amsTaskInsertDTO.getLocationFrom(), amsTaskInsertDTO.getLocationTo()));
+        //ext3存入最终目标点 入库任务则存放库位 出库任务则存放终点
         amsTask.setExt3(isExist ? null : amsTaskInsertDTO.getLocationTo());
+        //ext1 ext2 存放巷道号 入库任务存放堆垛车巷道号 出库任务存放起始库位巷道号 堆垛车巷道号默认为0 不传TS会报错
         amsTask.setExt1(isExist ? redisCache.getCacheObject(AmsConstant.LOCATION_ROW_KEY.concat(amsTask.getStTo().toString())) :
                 redisCache.checkIsExist(AmsConstant.WMS_CORRESPOND_AGV_STATION_KEY.concat(amsTaskInsertDTO.getLocationFrom())) ?
                         redisCache.getCacheObject(AmsConstant.LOCATION_ROW_KEY.concat(amsTaskInsertDTO.getLocationFrom())) : String.valueOf(BigDecimal.ZERO));
@@ -204,10 +208,13 @@ public class AmsTaskServiceImpl extends CrudServiceImpl<AmsTaskMapper, AmsTask,
         AmsTask amsTask = new AmsTask();
         amsTask.setId(Long.parseLong(IdWorker.getIdStr()));
         amsTask.setTaskNo(businessNo);
-        amsTask.setStFrom(redisCache.checkIsExist(AmsConstant.AGV_TO_PILLING_CAR_KEY.concat(stFrom.toString())) ?
-                redisCache.getCacheObject(AmsConstant.AGV_TO_PILLING_CAR_KEY.concat(stFrom.toString())) : convertLocation(stFrom.toString()));
+        amsTask.setStFrom(redisCache.checkIsExist(AmsConstant.AGV_TO_PILLING_CAR_KEY.
+                concat(AmsConstant.ZONE_TYPE.OUT_CACHE.getValue().toString()).concat(stFrom.toString())) ?
+                Integer.parseInt(redisCache.getCacheObject(AmsConstant.AGV_TO_PILLING_CAR_KEY.concat(AmsConstant.ZONE_TYPE.OUT_CACHE.getValue().toString()).concat(stFrom.toString())))
+                : convertLocation(stFrom.toString()));
         amsTask.setStTo(convertLocation(stTo));
-        amsTask.setExt1(redisCache.getCacheObject(AmsConstant.LOCATION_ROW_KEY.concat(stTo)));
+        amsTask.setExt1(redisCache.checkIsExist(AmsConstant.LOCATION_ROW_KEY.concat(stTo)) ?
+                redisCache.getCacheObject(AmsConstant.LOCATION_ROW_KEY.concat(stTo)) : String.valueOf(BigDecimal.ZERO));
         amsTask.setExt2(amsTask.getExt1());
         amsTask.setBusinessType(businessType);
         amsTask.setDeviceName(AmsConstant.AMS_SYS_NAME);
@@ -216,6 +223,7 @@ public class AmsTaskServiceImpl extends CrudServiceImpl<AmsTaskMapper, AmsTask,
         amsTask.setAciAccept(0);
         amsTask.setIkey((long) genIKey(amsTask.getId().toString()));
         amsTask.setRemark("move the cache location to the end location");
+        log.info("ndcAmsTaskInsert amsTask is :{}", amsTask);
         amsTaskMapper.insert(amsTask);
     }
 
@@ -224,10 +232,18 @@ public class AmsTaskServiceImpl extends CrudServiceImpl<AmsTaskMapper, AmsTask,
         return isExist ? Integer.parseInt(redisCache.getCacheObject(AmsConstant.WMS_CORRESPOND_AGV_STATION_KEY.concat(locationNo)).toString()) : Integer.parseInt(locationNo);
     }
 
+    /**
+     * 任务目标点转换为接驳位 入库任务为堆垛车接驳位 出库任务为三向车接驳位
+     * @param locationFromId
+     * @param locationToId
+     * @return
+     */
     private Integer getCacheLocation(String locationFromId, String locationToId) {
+        //缓存中存在起点信息 则为出库任务 不存在则为入库任务
         boolean isExist = redisCache.checkIsExist(AmsConstant.WMS_CORRESPOND_AGV_STATION_KEY.concat(locationFromId));
         String rowNo = isExist ?
                 redisCache.getCacheObject(AmsConstant.LOCATION_ROW_KEY.concat(locationFromId)) : redisCache.getCacheObject(AmsConstant.LOCATION_ROW_KEY.concat(locationToId));
+        //sys_config中存放仓库起点与终点库位编号 如果不存在 则入库任务起点/出库任务终点有误或未录入
         String locationConfig = sysConfigService.selectConfigByKey(SceneConstants.LOCATION_SCENE);
         if(StringUtils.isBlank(locationConfig)) throw new BaseException("location.scene.config is blank");
         Map<String, List<Integer>> locationConfigMap = JSONObject.parseObject(locationConfig, Map.class);
@@ -236,7 +252,8 @@ public class AmsTaskServiceImpl extends CrudServiceImpl<AmsTaskMapper, AmsTask,
         Assert.isTrue(ObjectUtil.isNotNull(zoneId), "location.scene.config is not exist this locationId");
         List<BaseLocationInfo> baseLocationInfoList = baseLocationInfoService.queryBaseLocationInfoList(zoneId, rowNo);
         Assert.isTrue(CollectionUtil.isNotEmpty(baseLocationInfoList), "this zone cache location is not exist");
-        return Integer.parseInt(baseLocationInfoList.stream().map(item -> isExist ? item.getAgvStation().toString() : item.getLocationNo()).findFirst().orElseThrow(() -> new BaseException("this zone cache location is not exist")));
+        return Integer.parseInt(baseLocationInfoList.stream().map(item -> isExist ? item.getAgvStation().toString() : item.getLocationNo()).
+                findFirst().orElseThrow(() -> new BaseException("this zone cache location is not exist")));
     }
 
     /**

warewms-ams/src/main/java/com/warewms/ams/ndc/service/impl/BaseLocationInfoServiceImpl.java

@@ -53,7 +53,8 @@ public class BaseLocationInfoServiceImpl extends CrudServiceImpl<BaseLocationInf
         for (BaseLocationInfo baseLocationInfo : baseLocationInfoList) {
             redisCache.setCacheObject(AmsConstant.WMS_CORRESPOND_AGV_STATION_KEY.concat(baseLocationInfo.getLocationNo()), baseLocationInfo.getAgvStation());
             redisCache.setCacheObject(AmsConstant.LOCATION_ROW_KEY.concat(baseLocationInfo.getLocationNo()), baseLocationInfo.getRowNo());
-            redisCache.setCacheObject(AmsConstant.AGV_TO_PILLING_CAR_KEY.concat(baseLocationInfo.getAgvStation().toString()), baseLocationInfo.getLocationNo());
+            redisCache.setCacheObject(AmsConstant.AGV_TO_PILLING_CAR_KEY.concat(baseLocationInfo.getZoneId().toString()).concat(baseLocationInfo.getAgvStation().toString()),
+                    baseLocationInfo.getLocationNo());
         }
     }
 
@@ -78,7 +79,6 @@ public class BaseLocationInfoServiceImpl extends CrudServiceImpl<BaseLocationInf
         baseLocationInfo.setShiftNo("1");
         baseLocationInfo.setShiftIndex(1l);
         baseLocationInfo.setStockStatus("00");
-        baseLocationInfo.setColNo("1");
         baseDao.insert(baseLocationInfo);
     }
 

warewms-ams/src/main/java/com/warewms/ams/ndc/service/impl/SocketBufferServiceImpl.java

@@ -128,14 +128,10 @@ public class SocketBufferServiceImpl implements SocketBufferService {
         event = eventBean;
         event.setLocationindex(ByteUtil.getInt(parameters, 26));
         event.setLp1("" + ByteUtil.getInt(parameters, 34));
-        log.info("lp1 is :{}", event.getLp1());
         event.setLp2("" + ByteUtil.getInt(parameters, 38));
-        log.info("lp2 is :{}", event.getLp2());
         event.setLp3("" + ByteUtil.getInt(parameters, 42));
-        log.info("lp3 is :{}", event.getLp3());
         event.setLp4("" + ByteUtil.getInt(parameters, 46));
         int eventId = event.getId();
-        log.info("evenId is :{}", eventId);
         if (ObjectUtil.isNotNull(AmsConstant.TASK_STS.getValueByKey(eventId))) {
             executorService.execute(() -> {
                 statusUpdateService.taskStateResponse(AmsConstant.TASK_STS.getValueByKey(eventId), icarNo, ByteUtil.getInt(parameters, 34));
@@ -163,7 +159,7 @@ public class SocketBufferServiceImpl implements SocketBufferService {
                     //任务状态回调
                     long taskId_85 = taskBean.getId().longValue();
                     executorService.execute(() -> {
-                        statusUpdateService.updateStatus(taskId_85, icarNo);
+                        statusUpdateService.updateStatus(taskId_85, icarNo, taskBeanUpdate.getSystemStatus());
                     });
                     break;
                 case 86://user event Order Receive              任务开始
@@ -191,7 +187,7 @@ public class SocketBufferServiceImpl implements SocketBufferService {
 
                         long taskId = taskBean.getId().longValue();
                         executorService.execute(() -> {
-                            statusUpdateService.updateStatus(taskId, icarNo);
+                            statusUpdateService.updateStatus(taskId, icarNo, taskBeanUpdate01.getSystemStatus());
                         });
                     }
                     break;

warewms-ams/src/main/java/com/warewms/ams/ndc/service/impl/StatusUpdateServiceImpl.java

@@ -31,7 +31,7 @@ public class StatusUpdateServiceImpl implements StatusUpdateService {
     }
 
     @Override
-    public void updateStatus(Long id, Integer carNo) {
+    public void updateStatus(Long id, Integer carNo, Integer state) {
         AmsTask amsTask = amsTaskService.selectAmsTaskById(id);
         if (ObjectUtil.isNull(amsTask)) return;
 
@@ -40,7 +40,7 @@ public class StatusUpdateServiceImpl implements StatusUpdateService {
             log.error("没有index，未下发的任务");
         }
         if (StringUtils.isNotBlank(amsTask.getExt3()) &&
-                amsTask.getSystemStatus().equals(AmsConstant.TASK_STS.TASK2.getValue())) {
+                state.equals(AmsConstant.TASK_STS.TASK2.getValue())) {
             amsTaskService.ndcAmsTaskInsert(amsTask.getTaskNo(), amsTask.getBusinessType(), amsTask.getStTo(), amsTask.getExt3());
         }
     }

warewms-ams/src/test/java/warewms/WarehouseTest.java

@@ -1,10 +1,13 @@
 package warewms;
 
 import com.warewms.WareWmsApplication;
+import com.warewms.ams.ndc.service.IAmsTaskService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.web.client.RestTemplate;
 
 ;
 
@@ -17,8 +20,16 @@ import org.springframework.test.context.junit4.SpringRunner;
 @SpringBootTest(classes = WareWmsApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 public class WarehouseTest {
 
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @Autowired
+    private IAmsTaskService amsTaskService;
+
+    private final String WMS_URL = "http://localhost:8008/base/locationInfo/save";
     @Test
     public void test() {
+        amsTaskService.ndcAmsTaskInsert("JHSWMS000005122_19", "01", 20000, "7014");
     }
 
 }