1.物料日志增加机台名,机台,Slot,Subslot,面别

src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java

@@ -732,7 +732,7 @@ public class StoragePosController {
         }
 
         String line = checkOutDto.getLine();
-        if (StringUtils.isEmpty(model)){
+        if (StringUtils.isEmpty(line)){
             throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"线体"});
         }
 

src/main/java/com/neotel/smfcore/core/system/rest/TaskController.java

@@ -115,6 +115,11 @@ public class TaskController {
                 headerList.add(Lists.newArrayList("类型"));
                 headerList.add(Lists.newArrayList("来源"));
                 headerList.add(Lists.newArrayList("线体"));
+                headerList.add(Lists.newArrayList("机台名"));
+                headerList.add(Lists.newArrayList("机台"));
+                headerList.add(Lists.newArrayList("Slot"));
+                headerList.add(Lists.newArrayList("Subslot"));
+                headerList.add(Lists.newArrayList("面别"));
                 headerList.add(Lists.newArrayList("状态"));
                 headerList.add(Lists.newArrayList("操作人"));
                 headerList.add(Lists.newArrayList("创建时间"));
@@ -135,6 +140,11 @@ public class TaskController {
                     result.add(dataLog.getType() == 1 ? "入库" : "出库");
                     result.add(dataLog.getSourceName());
                     result.add(dataLog.getLine());
+                    result.add(dataLog.getMachineName());
+                    result.add(dataLog.getTableNo());
+                    result.add(dataLog.getSlot());
+                    result.add(dataLog.getSubSlot());
+                    result.add(dataLog.getSide());
                     result.add(dataLog.getStatus());
                     result.add(dataLog.getCreator());
                     result.add(dataLog.getCreateDate());

src/main/java/com/neotel/smfcore/core/system/rest/bean/dto/TaskDto.java

@@ -148,6 +148,14 @@ public class TaskDto implements Serializable {
 
     private String line = "";
 
+    private String machineName = "";
+    private String tableNo = "";
+    private String slot = "";
+    private String subSlot = "";
+    private String side = "";
+
+
+
     public String getTaskColor() {
         if (ObjectUtil.isNotEmpty(lightColor)) {
             return "#" + lightColor;

src/main/java/com/neotel/smfcore/core/system/rest/bean/query/TaskQueryCondition.java

@@ -14,7 +14,7 @@ import java.util.Date;
 @ApiModel("查询条件")
 public class TaskQueryCondition {
 
-    @QueryCondition(blurry = "barcode,partNumber,posName,sourceName,subSourceInfo,memo,export")
+    @QueryCondition(blurry = "barcode,partNumber,posName,sourceName,subSourceInfo,memo,export,machineName,tableNo,slot,subSlot,side")
     @ApiModelProperty("模糊搜索")
     private String blurry;
 

src/main/java/com/neotel/smfcore/custom/lizhen/innerBox/util/StorageExportUtil.java

@@ -62,7 +62,7 @@ public class StorageExportUtil {
 
 
     //出料口名称
-    private final static List<String> exportStrArr = Arrays.asList("UM_1","UM_2", "UM_3", "UM_4", "UM_5");
+    private final static List<String> exportStrArr = Arrays.asList("UM_1", "UM_2", "UM_4", "UM_3", "UM_5");
 
     //料仓前缀
     public static final String EXPORT_PREFIX = "Storage_Export";

src/main/java/com/neotel/smfcore/custom/lizhen/third/maicheng/controller/MaiZhengDeviceController.java

@@ -2,6 +2,7 @@ package com.neotel.smfcore.custom.lizhen.third.maicheng.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.neotel.smfcore.common.bean.ResultBean;
+import com.neotel.smfcore.common.utils.DateUtil;
 import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.core.order.LiteOrderCache;
 import com.neotel.smfcore.core.order.service.manager.ILiteOrderManager;
@@ -95,7 +96,7 @@ public class MaiZhengDeviceController {
     @ApiOperation("获取迈征请求数据")
     @RequestMapping("/getTransReelBoxData")
     @AnonymousAccess
-    public ResultBean getTransReelBoxData(String orderNo) {
+    public ResultBean getTransReelBoxData(String orderNo,String reelBoxId) {
 
         if (StringUtils.isEmpty(orderNo)){
             return ResultBean.newErrorResult(-1,"","工单号不能为空");
@@ -110,8 +111,8 @@ public class MaiZhengDeviceController {
         paramMap.put("RepoOrder",liteOrder.getOrderNo());
         paramMap.put("Count",liteOrder.getCount());
         paramMap.put("CacheID",liteOrder.getCacheID());
-        paramMap.put("ReelBoxID",liteOrder.getReelBoxID());
-        paramMap.put("StartTime",liteOrder.getStartTime());
+        paramMap.put("ReelBoxID",reelBoxId);
+        paramMap.put("StartTime", DateUtil.toDateString(new Date(),"yyyy-MM-dd HH:mm:ss"));
 
         List<Map<String, Object>> list = new ArrayList<>();
         List<LiteOrderItem> orderItemList = liteOrder.getOrderItems();

src/main/java/com/neotel/smfcore/custom/lizhen/wcs/LizhenController.java

@@ -368,13 +368,14 @@ public class LizhenController {
                 item.setPickingId(pickingId);
                 item.setRowId(manualTower.getROW_ID());
                 item.setItemNo(manualTower.getITEM_NO());
-                item.setStation(manualTower.getMACHINE());
+                item.setTableNo(manualTower.getMACHINE());
                 item.setMo(manualTower.getMO());
                 item.setSlot(manualTower.getSLOT());
                 item.setSubSlot(manualTower.getSUBSLOT());
                 item.setBatchCode(manualTower.getBATCH_CODE());
                 item.setModel(manualTower.getMODEL());
                 item.setWarningItemId(manualTower.getITEM_NO()+"");
+                item.setMachineName(manualTower.getMACHINE_NAME());
                 itemList.add(item);
             }
             liteOrder = new LiteOrder();