接口参数修改

src/main/java/com/neotel/smfcore/custom/micron1053/api/MicronApi.java

@@ -668,6 +668,7 @@ public class MicronApi  {
                     barcodeList) {
                 resultMap.put(barcode.getBarcode(), new MaterialStatus(barcode.getBarcode(), barcode.getPartNumber(), "", "", true));
             }
+            return resultMap;
         }
 
         String url = config.getUrl(config.api_name_009);
@@ -735,7 +736,22 @@ public class MicronApi  {
 
 
     public static List<TrackStatus> Api010(String operationId, List<Material> materialList) {
+
         List<TrackStatus> statusList = new ArrayList<>();
+        if(Debug){
+            for (Material m :
+                    materialList) {
+                TrackStatus trackStatus=new TrackStatus();
+                trackStatus.setSuccess(true);
+                trackStatus.setDescription("");
+                trackStatus.setMaterialStatus("success");
+                trackStatus.setPartNumber(m.getPartNumber());
+                trackStatus.setSerialNum(m.getSerialNum());
+                statusList.add(trackStatus);
+                return statusList;
+            }
+        }
+
         String url = config.getUrl(config.api_name_010);
         try {
 
@@ -908,6 +924,9 @@ public class MicronApi  {
 //                "message": <ErrMessage>,
 //                "detail": <ErrDetail>
 //        }
+        if(Debug){
+            return "";
+        }
         String url = config.getUrl(config.api_name_201);
         url = MessageFormat.format(url, linePrepOrderId, operationId);
 

src/main/java/com/neotel/smfcore/custom/micron1053/task/MicronDispatchController.java

@@ -143,7 +143,7 @@ private IStoragePosManager storagePosManager;
 
             if (dto != null && ObjectUtil.isNotEmpty(dto.getOperationId())) {
 
-                if(ObjectUtil.isNotEmpty(dto.getLineId())||mode=="RACK"){
+                if(ObjectUtil.isNotEmpty(dto.getLineId())||(mode.equals("RACK"))){
 
                     //已有 operationId ，需要进入上传工单页面
                     return ResultBean.newErrorResult(1, "", "");
@@ -188,6 +188,11 @@ private IStoragePosManager storagePosManager;
             return ResultBean.newErrorResult(9, "smfcore.micron.apiClose", " Not yet open");
         }
 
+        TaskDto dto = getTaskDtoByMode(mode);
+        if(dto==null){
+            log.info("outSideSubmit 未找到mode="+mode+" 的TaskDto");
+            return ResultBean.newErrorResult(-1, "smfcore.micron.operationFailure", "操作失败");
+        }
         String csv = "csv";
         String excel = "xlsx";
         String fileType = FileUtil.getExtensionName(orderFile.getOriginalFilename());
@@ -197,9 +202,13 @@ private IStoragePosManager storagePosManager;
         }
         File folder = new File(properties.getPath(), "pos");
         File localFile = FileUtil.upload(orderFile, folder.getAbsolutePath());
+
         boolean result = orderFileWatch.handleOrderFile(localFile, mode, reason);
         if (result) {
 
+            dto.setLineId(reason);
+            dataCache.updateCache(Constants.CACHE_DISPATCH + mode,dto);
+
             //工单上传成功，开始挑料
             LiteOrder order=getOrderByMode(mode);
             liteOrderCache.OrderReady(order.getOrderNo());
@@ -265,7 +274,7 @@ private IStoragePosManager storagePosManager;
                 dto.setType(0);
                 dto.setMode(mode);
                 operationId = MicronApi.Api011(mode, SecurityUtils.getLoginUsername(), "");
-
+                dto.setLineId(lineId);
                 if (StringUtils.isNotBlank(operationId)) {
                     dto.setOperationId(operationId);
                     dataCache.updateCache(Constants.CACHE_DISPATCH + mode, dto);
@@ -413,7 +422,7 @@ private IStoragePosManager storagePosManager;
 
         String mode=params.get("mode").toString();
         String itemId=params.get("itemId").toString();
-        String[] selectRiList=(String[])params.get("submitRIS");
+        List<Object> selectRiList=(List<Object>)params.get("submitRIS");
         log.info(" itemDetial :mode=" + mode + ", itemId="+itemId);
         //判断有没有生成任务
         LiteOrder order=getOrderByMode(mode);
@@ -434,9 +443,9 @@ private IStoragePosManager storagePosManager;
 
                 List<Barcode> allBarcodes = new ArrayList<>();
                 //查找到详情，循环RI，生成API009数据
-                for (String ri :
+                for ( Object ri :
                         selectRiList) {
-                    StoragePos pos = storagePosManager.getByBarcode(ri);
+                    StoragePos pos = storagePosManager.getByBarcode(ri.toString());
                     if (pos != null) {
                         allBarcodes.add(pos.getBarcode());
                     }
@@ -516,8 +525,9 @@ private IStoragePosManager storagePosManager;
     @ApiOperation("重试按钮")
     @PostMapping("/retry")
     @AnonymousAccess
-    public ResultBean retry(@RequestBody String mode) {
+    public ResultBean retry(@RequestBody Map<String,Object> params) {
 
+        String mode = params.get("mode").toString();
         log.info(" retry :mode=" + mode + ",入库完成发送失败的，重新发送，其他状态暂不处理");
         //判断有没有生成任务
         LiteOrder order=getOrderByMode(mode);
@@ -562,20 +572,28 @@ private IStoragePosManager storagePosManager;
         return ResultBean.newOkResult("");
     }
 
-    private  void CloseOrder(LiteOrder order){
+    private  void CloseOrder(LiteOrder order) {
         order.setStatus(LITEORDER_STATUS.CLOSED);
         order.setClosed(true);
         liteOrderManager.save(order);
         liteOrderCache.addOrderToMap(order);
 
-        log.info(" mode="+order.getMode()+"工单关闭");
+        log.info(" mode=" + order.getMode() + "工单关闭");
+
+        if (ObjectUtil.isNotEmpty(order.getMode())) {
+
+            String key = Constants.CACHE_DISPATCH + order.getMode();
+            log.info("abort  mode=" + order.getMode() + " 清空 key=" + key + " 的cache");
+            dataCache.updateCache(key, "");
+        }
     }
 
     @ApiOperation("放弃出库")
     @PostMapping("/abort")
     @AnonymousAccess
-    public ResultBean abort(@RequestBody String mode) {
+    public ResultBean abort(@RequestBody Map<String,Object> params) {
 
+        String mode = params.get("mode").toString();
         log.info(" abort :mode=" + mode);
         LiteOrder order = getOrderByMode(mode);
         if (order == null) {
@@ -613,10 +631,9 @@ private IStoragePosManager storagePosManager;
     }
 
     public LiteOrder getOrderByMode(String mode) {
-        List<LiteOrderItem> itemList = new ArrayList<>();
         Collection<LiteOrder> liteOrder = liteOrderCache.getAllLiteOrder();
         for (LiteOrder order : liteOrder) {
-            if (mode.equals(order.getMode()) && !order.isClosed()) {
+            if (ObjectUtil.isNotEmpty(order.getMode())&& mode.equals(order.getMode()) && !order.isClosed()) {
                 return order;
 
             }
@@ -625,14 +642,10 @@ private IStoragePosManager storagePosManager;
     }
 
     public List<LiteOrderItem> getLiteOrderItemList(String mode) {
-        List<LiteOrderItem> itemList = new ArrayList<>();
-        Collection<LiteOrder> liteOrder = liteOrderCache.getAllLiteOrder();
-        for (LiteOrder order : liteOrder) {
-            if (ObjectUtil.isNotEmpty(order.getMode())&& mode.equals(order.getMode()) && !order.isClosed()) {
-                itemList = order.getOrderItems();
-                break;
-            }
+        LiteOrder order=getOrderByMode(mode);
+        if(order!=null){
+            return order.getOrderItems();
         }
-        return itemList;
+        return null;
     }
 }

src/main/java/com/neotel/smfcore/custom/micron1053/task/MicronPreTaskController.java

@@ -256,7 +256,9 @@ public class MicronPreTaskController {
     @ApiOperation("重试")
     @PostMapping("/retry")
     @AnonymousAccess
-    public ResultBean retry(@RequestBody String mode) {
+    public ResultBean retry(@RequestBody Map<String,Object> params) {
+
+        String mode=params.get("mode").toString();
         log.info(" retry :mode=" + mode + ",入库完成发送失败的，重新发送，其他状态暂不处理");
         TaskDto dto = getTaskDtoByMode(mode);
         if (dto == null) {

src/main/java/com/neotel/smfcore/custom/micron1053/task/bean/dto/DispatchItemDto.java

 package com.neotel.smfcore.custom.micron1053.task.bean.dto;
 
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.HashMap;
 import java.util.Map;
-
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class DispatchItemDto {
     @ApiModelProperty(value = "ID")
     private String id;
@@ -33,15 +38,10 @@ public class DispatchItemDto {
     @ApiModelProperty("站位信息")
     private String feederInfo = "";
 
-    /**
-     * 台车号
-     */
     @ApiModelProperty("台车号")
     private String tableNo = "";
 
-    /**
-     * 面别
-     */
+
     @ApiModelProperty("面别")
     private String side = "";
 
@@ -64,6 +64,10 @@ public class DispatchItemDto {
      */
     private String status;
 
+
+//    @ApiModelProperty("可用数量")
+//    private int currNum = 0;
+
     @ApiModelProperty("自定义的附加字段，key=字段名，value=值")
     public Map<String,String> appendData = new HashMap<>();
 }