Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java

@@ -279,7 +279,15 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
             map.put("point_code", point_code);
         }
         if (!StrUtil.isEmpty(create_time) && !StrUtil.isEmpty(end_time)) {
+            // 将字符串时间解析为日期对象
+            Date date = DateUtil.parse(create_time.replace("Z", " UTC"), "yyyy-MM-dd'T'HH:mm:ss.SSS Z");
+            // 将日期对象加上8小时
+            /*Date newDate = DateUtil.offsetHour(date, 8);*/
+            // 将新日期对象格式化为字符串时间
+            create_time = DateUtil.formatDateTime(date);
             map.put("create_time", create_time);
+            Date date1 = DateUtil.parse(end_time.replace("Z", " UTC"), "yyyy-MM-dd'T'HH:mm:ss.SSS Z");
+            end_time = DateUtil.formatDateTime(date1);
             map.put("end_time", end_time);
         }
         JSONObject jsonObject1 =

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/rest/XianGongAgvController.java

@@ -1,6 +1,7 @@
 package org.nl.acs.agv.rest;
 
 import com.alibaba.fastjson.JSONObject;
+import groovy.lang.Lazy;
 import org.nl.acs.agv.server.XianGongAgvService;
 import org.nl.common.logging.annotation.Log;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +18,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 @Controller
 public class XianGongAgvController {
-
+    @Lazy
     @Autowired
     private XianGongAgvService xianGongAgentService;
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java

@@ -30,7 +30,6 @@ import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.util.Date;
-import java.util.List;
 
 import static org.nl.acs.agv.server.impl.NDCAgvServiceImpl.Bytes2HexString;
 
@@ -233,13 +232,14 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
                             if (device.getDeviceDriver() instanceof StandardAutodoorDeviceDriver) {
                                 standardAutodoorDeviceDriver = (StandardAutodoorDeviceDriver) device.getDeviceDriver();
                                 try {
-                                    standardAutodoorDeviceDriver.writing("to_command", 1);
+                                    standardAutodoorDeviceDriver.writing("to_open", "1");
+                                    standardAutodoorDeviceDriver.writing("to_close", "0");
                                 } catch (Exception e) {
                                     log.info("下发电气信号失败:" + e.getMessage());
                                     e.printStackTrace();
                                 }
-                                if (standardAutodoorDeviceDriver.getAction() == 1 && standardAutodoorDeviceDriver.getTo_command() == 1) {
-                                    log.info("下发开门信号值为:{}", standardAutodoorDeviceDriver.getTo_command());
+                                if (standardAutodoorDeviceDriver.getOpen() == 1 && standardAutodoorDeviceDriver.getToOpen() == 1 ) {
+                                    log.info("下发开门信号值为:{},下发关门信号值为:{}", standardAutodoorDeviceDriver.getToOpen(), standardAutodoorDeviceDriver.getToClose());
                                     data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
                                 }
                             }

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/ItemProtocol.java

@@ -1,5 +1,6 @@
 package org.nl.acs.device_driver.autodoor.standard_autodoor;
 
+import cn.hutool.core.util.StrUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
 
@@ -8,13 +9,10 @@ import java.util.List;
 
 @Slf4j
 public class ItemProtocol {
-    public static String item_heartbeat = "heartbeat";
-    public static String item_mode = "mode";
-    public static String item_state = "state";
-    public static String item_action = "action";
-    public static String item_error = "error";
-    public static String item_to_command = "to_command";
-    public static String item_to_state = "to_state";
+    public static String item_open = "open";
+    public static String item_close = "close";
+    public static String item_to_open = "to_open";
+    public static String item_to_close = "to_close";
 
 
     private StandardAutodoorDeviceDriver driver;
@@ -23,35 +21,27 @@ public class ItemProtocol {
         this.driver = driver;
     }
 
-    public int getHeartbeat() {
-        return this.getOpcIntegerValue(item_heartbeat);
+    public int getOpen() {
+        return this.getOpcIntegerValue(item_open);
     }
 
-    public int getMode() {
-        return this.getOpcIntegerValue(item_mode);
+    public int getClose() {
+        return this.getOpcIntegerValue(item_close);
     }
 
-    public int getAction() {
-        return this.getOpcIntegerValue(item_action);
+
+    public int getToOpen() {
+        return this.getOpcIntegerValue(item_to_open);
     }
 
-    public int getError() {
-        return this.getOpcIntegerValue(item_error);
+    public int getToClose() {
+        return this.getOpcIntegerValue(item_to_close);
     }
 
-    public int getToCommand() {
-        return this.getOpcIntegerValue(item_to_command);
-    }
-
-    public int getToState() {
-        return this.getOpcIntegerValue(item_to_state);
-    }
-
-
     public int getOpcIntegerValue(String protocol) {
         Integer value = this.driver.getIntegeregerValue(protocol);
         if (value == null) {
-//            log.error("读取错误!");
+            // log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
         } else {
             return value;
         }
@@ -59,22 +49,34 @@ public class ItemProtocol {
 
     }
 
+    public String getOpcStringValue(String protocol) {
+        String value = this.driver.getStringValue(protocol);
+        if (StrUtil.isEmpty(value)) {
+
+        } else {
+            return value;
+        }
+        return "0";
+    }
+
     public static List<ItemDto> getReadableItemDtos() {
         ArrayList list = new ArrayList();
-        list.add(new ItemDto(item_heartbeat, "心跳", "DB600.B0"));
-        list.add(new ItemDto(item_mode, "工作模式", "DB600.B1", Boolean.valueOf(true)));
-        list.add(new ItemDto(item_state, "工作状态", "DB600.B2"));
-        list.add(new ItemDto(item_action, "动作信号", "DB600.B3"));
-        list.add(new ItemDto(item_error, "报警信号", "DB600.B4"));
+        list.add(new ItemDto(item_open, "开到位", "10001"));
+        list.add(new ItemDto(item_close, "关到位", "10002"));
         return list;
     }
 
     public static List<ItemDto> getWriteableItemDtos() {
         ArrayList list = new ArrayList();
-        list.add(new ItemDto(item_to_command, "作业命令", "DB601.W2", Boolean.valueOf(true)));
-        list.add(new ItemDto(item_to_state, "下发状态", "DB601.W3", Boolean.valueOf(true)));
+        list.add(new ItemDto(item_to_open, "下发开门", "00001"  ));
+        list.add(new ItemDto(item_to_close, "下发关门", "00002"));
         return list;
     }
 
+
+    @Override
+    public String toString() {
+        return "";
+    }
 }
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/StandardAutodoorDefination.java

@@ -2,12 +2,11 @@ package org.nl.acs.device_driver.autodoor.standard_autodoor;
 
 import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
 import org.nl.acs.device.domain.Device;
+import org.nl.acs.device.enums.DeviceType;
 import org.nl.acs.device_driver.DeviceDriver;
 import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination;
-import org.nl.acs.device.enums.DeviceType;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -31,6 +30,7 @@ public class StandardAutodoorDefination implements OpcDeviceDriverDefination {
         return "标准版-自动门";
     }
 
+
     @Override
     public DeviceDriver getDriverInstance(Device device) {
         return (new StandardAutodoorDeviceDriver()).setDevice(device).setDriverDefination(this);
@@ -49,18 +49,10 @@ public class StandardAutodoorDefination implements OpcDeviceDriverDefination {
         return types;
     }
 
+
     @Override
     public List<ItemDto> getReadableItemDtos() {
-        return getReadableItemDtos2();
-    }
-
-    public static List<ItemDto> getReadableItemDtos2() {
-        List<ItemDto> list = new ArrayList();
-        list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB600.B0"));
-        list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "DB600.B1", true));
-        list.add(new ItemDto(ItemProtocol.item_action, "动作信号", "DB600.B2"));
-        list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "DB600.B4"));
-        return list;
+        return ItemProtocol.getReadableItemDtos();
     }
 
     @Override

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/StandardAutodoorDeviceDriver.java

@@ -4,98 +4,41 @@ import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.acs.common.base.CommonFinalParam;
 import org.nl.acs.device.domain.Device;
-import org.nl.acs.ext.wms.data.one.feedBackTaskStatus.FeedBackTaskStatusRequest;
-import org.nl.acs.ext.wms.service.AcsToWmsService;
-import org.nl.acs.utils.ReadUtil;
-import org.nl.acs.device.service.DeviceService;
 import org.nl.acs.device_driver.DeviceDriver;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
-import org.nl.acs.instruction.service.InstructionService;
-import org.nl.acs.route.service.RouteLineService;
-import org.nl.acs.task.service.TaskService;
+import org.nl.acs.log.service.DeviceExecuteLogService;
+import org.nl.acs.monitor.DeviceStageMonitor;
+import org.nl.acs.utils.ReadUtil;
 import org.nl.config.SpringContextHolder;
 import org.openscada.opc.lib.da.Server;
 
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
+
 /**
  * 自动门驱动
  */
 @Slf4j
 @Data
 @RequiredArgsConstructor
-public class StandardAutodoorDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver {
+public class StandardAutodoorDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, DeviceStageMonitor {
     protected ItemProtocol itemProtocol = new ItemProtocol(this);
+    DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl");
 
-    InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl");
+    int open = 0;
+    int close = 0;
 
-    DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl");
+    int last_open = 0;
+    int last_close = 0;
 
-    RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl");
-
-    TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl");
-
-    AcsToWmsService acsToWmsService = SpringContextHolder.getBean("acsToWmsServiceImpl");
-    String container;
-    String container_type_desc;
-    String last_container_type_desc;
-    String last_container;
-    //放货准备锁
-    String putReadyLock = null;
-    //有货标记
-    protected boolean has_goods_tag = false;
-    String devicecode;
-    int mode = 0;
-    int action = 0;
-    int error = 0;
-    Boolean iserror = false;
-
-    int move = 0;
-    int task = 0;
-    int state = 0;
-    int last_state = 0;
-    int last_action = 0;
-    int last_mode = 0;
-    int last_error = 0;
-    int last_move = 0;
-    int last_task = 0;
-
-    boolean hasVehicle = false;
-    boolean isReady = false;
-    protected int instruction_num = 0;
-    protected int instruction_num_truth = 0;
-    protected boolean hasGoods = false;
-    boolean isFold = false;
-    private String assemble_check_tag;
-    private Boolean sampleMode0;
-    private Boolean sampleMode3;
-    private Integer sampleError;
-    private Boolean sampleOnline;
-    protected String displayMessage = null;
-    public int display_message_time_out = 30000;
-    public Date display_message_time;
-    protected String current_stage_instruction_message;
-    protected String last_stage_instruction_message;
-    Integer heartbeat_tag;
-    private Date instruction_require_time = new Date();
-    private Date instruction_finished_time = new Date();
-
-    int to_command = 0;
-    int last_to_command = 0;
-
-
-
-    private int instruction_require_time_out;
-    boolean requireSucess = false;
-
-    private int instruction_finished_time_out;
-
-    int branchProtocol = 0;
+    int toOpen = 0;
+    int last_toOpen = 0;
+    int toClose = 0;
+    int last_toClose = 0;
+    String device_code = null;
 
     @Override
     public Device getDevice() {
@@ -107,55 +50,44 @@ public class StandardAutodoorDeviceDriver extends AbstractOpcDeviceDriver implem
     public void execute() {
         String message = null;
 
-        String device_code = this.getDevice().getDevice_code();
-        mode = this.itemProtocol.getMode();
-        action = this.itemProtocol.getAction();
-        error = this.itemProtocol.getError();
-        to_command = this.itemProtocol.getToCommand();
-        if (mode != last_mode) {
+        device_code = this.getDevice().getDevice_code();
+        open = this.itemProtocol.getOpen();
+        close = this.itemProtocol.getClose();
+        toOpen = this.itemProtocol.getToOpen();
+        toClose = this.itemProtocol.getToClose();
+        if (open != last_open) {
+            logServer.deviceExecuteLog(this.device_code, "", "", "信号open：" + last_open + "->" + open);
         }
-        if (action != last_action) {
+        if (close != last_close) {
+            logServer.deviceExecuteLog(this.device_code, "", "", "信号close：" + last_close + "->" + close);
+            if(close ==1 ){
+                this.writing("to_close","0");
+            }
         }
-        if (error != last_error) {
-        }
-        if (state != last_state) {
-            //固化室状态变更后通知lms更新固化室状态
-            FeedBackTaskStatusRequest request = new FeedBackTaskStatusRequest();
-            request.setState(String.valueOf(state));
-            request.setDevice_code(this.devicecode);
-            request.setType(CommonFinalParam.ONE);
-            acsToWmsService.notify(request);
-        }
-        last_action = action;
-        last_mode = mode;
-        last_error = error;
-        last_state = state;
-        last_to_command = to_command;
-        //message = StringFormatUtl.format("设备报警:{}", new Object[]{});
-
-//        String manual_create_task = this.getDevice().getExtraValue().get("manual_create_task").toString();
+        if (toClose != last_toClose) {
+            logServer.deviceExecuteLog(this.device_code, "", "", "信号toClose：" + last_toClose + "->" + toClose);
 
+        }
+        if (toOpen != last_toOpen) {
+            logServer.deviceExecuteLog(this.device_code, "", "", "信号toOpen：" + last_toOpen + "->" + toOpen);
+        }
+        last_open = open;
+        last_close = close;
+        last_toClose = toClose;
+        last_toOpen = toOpen;
     }
 
-    public synchronized String getStatus() {
-        JSONObject jo = new JSONObject();
 
-        if (action == 1) {
-            jo.put("name", this.getDevice().getDevice_code());
-            jo.put("status", "OPEN");
+    public void writing(String param, String value) {
+        String to_param = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+                + "." + param;
+        Map<String, Object> itemMap = new HashMap<String, Object>();
+        itemMap.put(to_param, Integer.parseInt(value));
 
-        } else if (action == 2) {
-            jo.put("name", this.getDevice().getDevice_code());
-            jo.put("status", "CLOSE");
-
-        } else {
-            jo.put("name", this.getDevice().getDevice_code());
-            jo.put("status", "ERROR");
-        }
-        return jo.toString();
+        this.control(itemMap);
+        logServer.deviceExecuteLog(device_code, "", "", "下发电气信号设备号:" + device_code + ",下发电气:" + to_param + ",下发电气值:" + value);
     }
 
-
     public void writing(String param, int command) {
         String to_command = String.format("%s.%s.%s.%s", this.getDevice().getOpc_server_code(), this.getDevice().getOpc_plc_code(), this.getDevice().getDevice_code(), param);
 
@@ -165,19 +97,37 @@ public class StandardAutodoorDeviceDriver extends AbstractOpcDeviceDriver implem
         itemMap.put(to_command, command);
         ReadUtil.write(itemMap, server);
         log.info("下发PLC信号：{},{}", to_command, command);
-        System.out.println("设备：" + devicecode + ",下发PLC信号：" + to_command + ",value:" + command);
+        System.out.println("设备：" + this.device_code + ",下发PLC信号：" + to_command + ",value:" + command);
 
     }
 
-    public synchronized void OpenOrClose(String type) {
-
-        //开门
-        if (CommonFinalParam.ONE.equals(type)) {
-            writing(ItemProtocol.item_to_command, 1);
-        } else {
-            writing(ItemProtocol.item_to_command, 2);
+    @Override
+    public JSONObject getDeviceStatusName() {
+        JSONObject jo = new JSONObject();
+        String open = "";
+        String close = "";
+        if (this.getOpen() == 0) {
+            open = "未知";
+        } else if (this.getOpen() == 1) {
+            open = "开到位";
         }
+        if (this.getClose() == 0) {
+            open = "未知";
+        } else if (this.getClose() == 1) {
+            open = "关到位";
+        }
+        jo.put("device_name", this.getDevice().getDevice_name());
+        jo.put("open", open);
+        jo.put("close", close);
+        jo.put("isOnline", true);
+
+        return jo;
+    }
+
+    @Override
+    public void setDeviceStatus(JSONObject data) {
 
     }
 
+
 }

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java

@@ -271,14 +271,14 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr
             this.require_apply_strangulation_time = date;
 //            String vehicle_code = "";
 //
-//            if (StrUtil.isEmpty(vehicle_code)) {
-//                message = LangProcess.msg("one_message8") + ": "  + task + LangProcess.msg("one_message11");
-//                return;
-//            }
-
+            Instruction inst = instructionService.findByCodeFromCache(String.valueOf(task));
+            if (StrUtil.isEmpty(inst.getVehicle_code())) {
+                message = LangProcess.msg("one_message8") + ": "  + task + LangProcess.msg("one_message11");
+                return;
+            }
             JSONObject param = new JSONObject();
             param.put("device_code", device_code);
-            param.put("vehicle_code", material_barcode);
+            param.put("vehicle_code", inst.getVehicle_code());
             param.put("type", AcsToLmsApplyTaskTypeEnum.LABEL_BIND.getType());
             String response  = acsToWmsService.deviceApplyTwo(param);
             JSONObject jo = JSON.parseObject(response);
@@ -289,7 +289,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr
                             .build();
                     luceneExecuteLogService.deviceExecuteLog(logDto2);
 //                    Map datas = applyLabelingAndBindingResponse.getData();
-                    packagePLCData(jo.getString("body"));
+                    packagePLCData(jo.getString("data"));
                     requireSucess = true;
                 } else {
                     LuceneLogDto logDto2 = LuceneLogDto.builder()

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/manipulator_cache/ItemProtocol.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.manipulator_cache;
+package org.nl.acs.device_driver.one_conveyor.manipulator_cache;
 
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/manipulator_cache/ManipulatorCacheDefination.java

@@ -1,19 +1,21 @@
-package org.nl.acs.device_driver.manipulator_cache;
+package org.nl.acs.device_driver.one_conveyor.manipulator_cache;
 
+import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
 import org.nl.acs.device.domain.Device;
 import org.nl.acs.device.enums.DeviceType;
 import org.nl.acs.device_driver.DeviceDriver;
 import org.nl.acs.device_driver.DeviceDriverDefination;
+import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination;
 import org.springframework.stereotype.Service;
 
 import java.util.LinkedList;
 import java.util.List;
 
 /**
- * 扫码器
+ * 行架对接缓存位
  */
 @Service
-public class ManipulatorCacheDefination implements DeviceDriverDefination {
+public class ManipulatorCacheDefination implements OpcDeviceDriverDefination {
     @Override
     public String getDriverCode() {
         return "manipulator_cache";
@@ -35,6 +37,17 @@ public class ManipulatorCacheDefination implements DeviceDriverDefination {
 
     }
 
+    @Override
+    public List<ItemDto> getReadableItemDtos() {
+        return ItemProtocol.getReadableItemDtos();
+    }
+
+    @Override
+    public List<ItemDto> getWriteableItemDtos() {
+        return null;
+    }
+
+
     @Override
     public Class<? extends DeviceDriver> getDeviceDriverType() {
         return ManipulatorCacheDeviceDriver.class;

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/manipulator_cache/ManipulatorCacheDeviceDriver.java

@@ -1,9 +1,5 @@
-package org.nl.acs.device_driver.manipulator_cache;
+package org.nl.acs.device_driver.one_conveyor.manipulator_cache;
 
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
@@ -25,7 +21,7 @@ import java.util.*;
 import java.util.concurrent.ThreadPoolExecutor;
 
 /**
- * 标准版扫码器
+ * 行架对接缓存位
  */
 @Slf4j
 @Data

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java

@@ -1,7 +1,6 @@
 package org.nl.acs.device_driver.one_manipulator.box_package_manipulator;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -20,8 +19,7 @@ import org.nl.acs.device_driver.RouteableDeviceDriver;
 import org.nl.acs.device_driver.conveyor.siemens_conveyor.SiemensConveyorDeviceDriver;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
-import org.nl.acs.device_driver.manipulator_cache.ManipulatorCacheDeviceDriver;
-import org.nl.acs.device_driver.one_conveyor.box_subvolumes_conveyor.BoxSubvolumesConveyorDeviceDriver;
+import org.nl.acs.device_driver.one_conveyor.manipulator_cache.ManipulatorCacheDeviceDriver;
 import org.nl.acs.history.ErrorUtil;
 import org.nl.acs.history.service.DeviceErrorLogService;
 import org.nl.acs.history.service.impl.DeviceErrorLogServiceImpl;

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/volume_two_manipulator/VolumeTwoManipulatorManipulatorDeviceDriver.java

@@ -19,7 +19,7 @@ import org.nl.acs.device_driver.RouteableDeviceDriver;
 import org.nl.acs.device_driver.conveyor.siemens_conveyor.SiemensConveyorDeviceDriver;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
-import org.nl.acs.device_driver.manipulator_cache.ManipulatorCacheDeviceDriver;
+import org.nl.acs.device_driver.one_conveyor.manipulator_cache.ManipulatorCacheDeviceDriver;
 import org.nl.acs.device_driver.one_manipulator.trapped_manipulator.InteractionJsonDTO;
 import org.nl.acs.enums.VolumeTwoTypeEnum;
 import org.nl.acs.history.ErrorUtil;

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java

@@ -1,20 +1,17 @@
 package org.nl.acs.device_driver.stacker.standard_stacker;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.checkerframework.common.value.qual.StringVal;
 import org.nl.acs.common.base.CommonFinalParam;
 import org.nl.acs.device.domain.Device;
 import org.nl.acs.device.enums.DeviceType;
-import org.nl.acs.device.enums.ErrorType;
 import org.nl.acs.device.service.DeviceExtraService;
 import org.nl.acs.device.service.impl.DeviceExtraServiceImpl;
 import org.nl.acs.device_driver.DeviceDriver;
@@ -25,10 +22,7 @@ import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
 import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl;
-import org.nl.acs.history.ErrorUtil;
-import org.nl.acs.history.domain.AcsDeviceErrorLog;
 import org.nl.acs.history.service.DeviceErrorLogService;
-import org.nl.acs.history.service.dto.DeviceErrorLogDto;
 import org.nl.acs.history.service.impl.DeviceErrorLogServiceImpl;
 import org.nl.acs.instruction.domain.Instruction;
 import org.nl.acs.instruction.service.InstructionService;
@@ -42,6 +36,7 @@ import org.nl.acs.route.service.impl.RouteLineServiceImpl;
 import org.nl.acs.task.domain.Task;
 import org.nl.acs.task.service.TaskService;
 import org.nl.acs.task.service.dto.TaskDto;
+import org.nl.common.utils.RedisUtils;
 import org.nl.config.SpringContextHolder;
 import org.nl.config.language.LangProcess;
 import org.nl.config.lucene.service.LuceneExecuteLogService;
@@ -78,6 +73,11 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
 
     LuceneExecuteLogService luceneExecuteLogService  =  SpringContextHolder.getBean("luceneExecuteLogServiceImpl");
 
+    public static final String REDIS_MOVE_BOX = "MOVE:MOVE_TASK";
+
+    @Autowired
+    private RedisUtils redisUtils;
+
     /**
      * 禁止入库
      */
@@ -286,6 +286,8 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
     Instruction inst = null;
 
 
+
+
     @Override
     public Device getDevice() {
         return this.device;
@@ -479,6 +481,18 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
                     Instruction inst = checkInst();
                     try {
                         finish_instruction(inst);
+//                        if (ObjectUtil.isNotEmpty(redisUtils.get(REDIS_MOVE_BOX))){
+//                            String taskRedis = redisUtils.get(REDIS_MOVE_BOX).toString();
+//                            task = Integer.valueOf(taskRedis);
+//                            Instruction instOld = checkInst();
+//                            List list1 = new ArrayList();
+//                            pakageCommand(list1, taskRedis);
+//                            pakagePlc(instOld, list1);
+//                            if (ObjectUtil.isNotNull(list1)) {
+//                                this.writing(list1);
+//                            }
+//                        }
+//                        list.remove(0);
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -565,29 +579,58 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
             return;
         } else {
             Instruction instruction = instructionService.findByCode(String.valueOf(task));
-            if (ObjectUtil.isNotEmpty(instruction)){
+            if (ObjectUtil.isEmpty(instruction)){
                 message = "one_message9";
                 return;
             }
             JSONObject param = new JSONObject();
             param.put("task_code", instruction.getTask_code());
+            param.put("task_id", instruction.getTask_id());
             param.put("type", type);
             String response = acsToWmsService.applyUpdatePointCode(param);
             JSONObject jo = JSON.parseObject(response);
             if (StrUtil.isNotEmpty(jo.getString("body")) || jo.getInteger("status") == 200) {
-                LuceneLogDto logDto2 = LuceneLogDto.builder()
-                        .device_code(device_code)
-                        .content("申请更新点位,参数,接口返回:" + jo)
-                        .build();
-                luceneExecuteLogService.deviceExecuteLog(logDto2);
-                JSONObject pointCodeJson = JSON.parseObject(jo.getString("body"));
-                String poinCode = pointCodeJson.getString("poin_code").toString();
-                if (type.equals(StandarStirageErroEnum.BLOCK_OUT.getType()) || type.equals(StandarStirageErroEnum.VOIDANCE.getType())){
-                    updateData1(poinCode, instruction);
-                }
-                if (type.equals(StandarStirageErroEnum.BLOCK_IN.getType()) || type.equals(StandarStirageErroEnum.FILL.getType())){
-                    updateData2(poinCode, instruction);
+                try {
+                    LuceneLogDto logDto2 = LuceneLogDto.builder()
+                            .device_code(device_code)
+                            .content("申请更新点位,参数,接口返回:" + jo)
+                            .build();
+                    luceneExecuteLogService.deviceExecuteLog(logDto2);
+                    String poinCode = jo.getString("point_code");
+                    if (StrUtil.isNotEmpty(poinCode)) {
+                        String[] split = poinCode.split("-");
+                        Device point = deviceAppService.findDeviceByCode(split[0]);
+                        if (ObjectUtil.isEmpty(point)) {
+                            message = "one_message18";
+                        }
+                        if (type.equals(StandarStirageErroEnum.VOIDANCE.getType())) {
+                            updateData1(poinCode, instruction, point, split);
+                            pakageData(point, split);
+                        }
+                        if (type.equals(StandarStirageErroEnum.BLOCK_IN.getType()) || type.equals(StandarStirageErroEnum.FILL.getType())) {
+                            updateData2(poinCode, instruction, point, split);
+                            pakageData(point, split);
+                        }
+                    }
+                    if (StrUtil.isNotEmpty(jo.getString("task_id"))) {
+                        //取货潜货位阻挡做完移库任务
+                        if (type.equals(StandarStirageErroEnum.BLOCK_OUT.getType())) {
+                            //存缓存
+                            redisUtils.set(REDIS_MOVE_BOX, task);
+                            TaskDto taskId = taskserver.findById(jo.getString("task_id"));
+                            if (ObjectUtil.isNotEmpty(taskId)) {
+                                String poinCodeMove = taskId.getStart_point_code();
+                                String[] split = poinCodeMove.split("-");
+                                Device point = deviceAppService.findDeviceByCode(split[0]);
+                                pakageData(point, split);
+                            }
+                        }
+                    }
+                }catch (Exception e){
+                    this.requireSucess = true;
+                    e.printStackTrace();
                 }
+
                 this.requireSucess = true;
             } else {
                 LuceneLogDto logDto2 = LuceneLogDto.builder()
@@ -599,47 +642,81 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
         }
     }
 
-    private void updateData2(String poinCode, Instruction instruction) {
-        Instruction instructionUpdate = new Instruction();
-        instructionUpdate.setNext_point_code(poinCode);
-        String[] split = poinCode.split("-");
-        Device endPoint = deviceAppService.findDeviceByCode(split[0]);
-        instructionUpdate.setTo_x(endPoint.getExtraValue().get("x").toString());
-        instructionUpdate.setNext_device_code(split[0]);
-        instructionUpdate.setTo_y(split[1]);
-        instructionUpdate.setTo_z(split[2]);
-        instructionUpdate.setInstruction_code(String.valueOf(task));
-        instructionService.updateByInstructionCode(instructionUpdate);
-        Task taskUpdate = new Task();
-        taskUpdate.setTo_x(endPoint.getExtraValue().get("x").toString());
-        taskUpdate.setNext_device_code(split[0]);
-        taskUpdate.setTo_y(split[1]);
-        taskUpdate.setTo_z(split[2]);
-        taskUpdate.setTask_code(instruction.getTask_code());
-        taskserver.updateByTaskCode(taskUpdate);
+    private void pakageData( Device point, String[] split) {
+        List list = new ArrayList();
+        String x = point.getExtraValue().get("x").toString();
+        String y = split[1];
+        String z = split[2];
+        HashMap map1 = new HashMap();
+        map1.put("code", "to_x");
+        map1.put("value", y);
+        list.add(map1);
+        HashMap map2 = new HashMap();
+        map2.put("code", "to_y");
+        map2.put("value", z);
+        list.add(map2);
+        HashMap map3 = new HashMap();
+        map3.put("code", "to_z");
+        map3.put("value", x);
+        list.add(map3);
+        if (ObjectUtil.isNotEmpty(list)) {
+            this.writing(list);
+        }
     }
 
-    private void updateData1(String poinCode, Instruction instruction) {
-        Instruction instructionUpdate = new Instruction();
+    private void updateData2(String poinCode, Instruction instruction, Device point, String[] split) {
+        Instruction instructionUpdate = checkInst();
+        TaskDto taskUpdate = new TaskDto();
+        instructionUpdate.setNext_point_code(poinCode);
+        instructionUpdate.setNext_device_code(split[0]);
+        taskUpdate.setNext_point_code(poinCode);
+        taskUpdate.setNext_device_code(split[0]);
+        taskUpdate.setTask_id(instructionUpdate.getTask_id());
+        pakageData2(instruction, instructionUpdate, point, split, taskUpdate);
+        instructionService.update(instructionUpdate);
+        taskserver.update(taskUpdate);
+    }
+
+    private void updateData1(String poinCode, Instruction instruction, Device point, String[] split) {
+        Instruction instructionUpdate = checkInst();
+        TaskDto taskUpdate = new TaskDto();
         instructionUpdate.setStart_point_code(poinCode);
-        String[] split = poinCode.split("-");
-        Device starPoint = deviceAppService.findDeviceByCode(split[0]);
-        instructionUpdate.setFrom_x(starPoint.getExtraValue().get("x").toString());
         instructionUpdate.setStart_device_code(split[0]);
+        taskUpdate.setStart_point_code(poinCode);
+        taskUpdate.setStart_device_code(split[0]);
+        taskUpdate.setTask_id(instructionUpdate.getTask_id());
+        pakageData1(instruction, instructionUpdate, point, split, taskUpdate);
+        //更新缓存数据库
+        instructionService.update(instructionUpdate);
+        taskserver.update(taskUpdate);
+    }
+
+    private void pakageData1(Instruction instruction, Instruction instructionUpdate, Device starPoint, String[] split, TaskDto taskUpdate) {
+        instructionUpdate.setFrom_x(starPoint.getExtraValue().get("x").toString());
         instructionUpdate.setFrom_y(split[1]);
         instructionUpdate.setFrom_z(split[2]);
         instructionUpdate.setInstruction_code(String.valueOf(task));
-        instructionService.updateByInstructionCode(instructionUpdate);
-        Task taskUpdate = new Task();
         taskUpdate.setFrom_x(starPoint.getExtraValue().get("x").toString());
-        taskUpdate.setStart_device_code(split[0]);
         taskUpdate.setFrom_y(split[1]);
         taskUpdate.setFrom_z(split[2]);
         taskUpdate.setTask_code(instruction.getTask_code());
-        taskserver.updateByTaskCode(taskUpdate);
+
     }
 
 
+    private void pakageData2(Instruction instruction, Instruction instructionUpdate, Device starPoint, String[] split, TaskDto taskUpdate) {
+        instructionUpdate.setTo_x(starPoint.getExtraValue().get("x").toString());
+        instructionUpdate.setTo_y(split[1]);
+        instructionUpdate.setTo_z(split[2]);
+        instructionUpdate.setInstruction_code(String.valueOf(task));
+        taskUpdate.setTo_x(starPoint.getExtraValue().get("x").toString());
+        taskUpdate.setTo_y(split[1]);
+        taskUpdate.setTo_z(split[2]);
+        taskUpdate.setTask_code(instruction.getTask_code());
+    }
+
+
+
     /**
      * 申请任务
      *
@@ -704,18 +781,8 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
                     }
                 }
                 List list = new ArrayList();
-                HashMap map1 = new HashMap();
-                map1.put("code", "to_device_code");
-                map1.put("value", this.getDevice().getAddress());
-                list.add(map1);
-                HashMap map2 = new HashMap();
-                map2.put("code", "to_command");
-                map2.put("value", 1);
-                list.add(map2);
-                HashMap map3 = new HashMap();
-                map3.put("code", "to_task");
-                list.add(map3);
-                map3.put("value", inst.getInstruction_code());
+
+                pakageCommand(list, inst.getInstruction_code());
                 if (StrUtil.equals(startDevice.getDevice_type(), DeviceType.conveyor.name())) {
                     if (ObjectUtil.isNotEmpty(startDevice.getExtraValue().get("z"))) {
                         HashMap map4 = new HashMap();
@@ -737,26 +804,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
                     }
                 }
                 if (StrUtil.equals(startDevice.getDevice_type(), DeviceType.storage.name())) {
-                    HashMap map4 = new HashMap();
-                    map4.put("code", "to_y");
-                    map4.put("value", inst.getFrom_z());
-                    list.add(map4);
-                    if (inst.getFrom_x().length() > 1) {
-                        String substring = inst.getFrom_x().substring(1);
-                        HashMap map5 = new HashMap();
-                        map5.put("code", "to_z");
-                        map5.put("value", substring);
-                        list.add(map5);
-                    } else {
-                        HashMap map6 = new HashMap();
-                        map6.put("code", "to_z");
-                        map6.put("value", inst.getFrom_x());
-                        list.add(map6);
-                    }
-                    HashMap map7 = new HashMap();
-                    map7.put("code", "to_x");
-                    map7.put("value", inst.getFrom_y());
-                    list.add(map7);
+                    pakagePlc(inst, list);
                 }
                 if (ObjectUtil.isNotEmpty(list)) {
                     this.writing(list);
@@ -767,6 +815,44 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
         return true;
     }
 
+    private void pakagePlc(Instruction inst, List list) {
+        HashMap map4 = new HashMap();
+        map4.put("code", "to_y");
+        map4.put("value", inst.getFrom_z());
+        list.add(map4);
+        if (inst.getFrom_x().length() > 1) {
+            String substring = inst.getFrom_x().substring(1);
+            HashMap map5 = new HashMap();
+            map5.put("code", "to_z");
+            map5.put("value", substring);
+            list.add(map5);
+        } else {
+            HashMap map6 = new HashMap();
+            map6.put("code", "to_z");
+            map6.put("value", inst.getFrom_x());
+            list.add(map6);
+        }
+        HashMap map7 = new HashMap();
+        map7.put("code", "to_x");
+        map7.put("value", inst.getFrom_y());
+        list.add(map7);
+    }
+
+    private void pakageCommand( List list, String inst) {
+        HashMap map1 = new HashMap();
+        map1.put("code", "to_device_code");
+        map1.put("value", this.getDevice().getAddress());
+        list.add(map1);
+        HashMap map2 = new HashMap();
+        map2.put("code", "to_command");
+        map2.put("value", 1);
+        list.add(map2);
+        HashMap map3 = new HashMap();
+        map3.put("code", "to_task");
+        map3.put("value", inst);
+        list.add(map3);
+    }
+
     /**
      * 将指令根据优先级和创建时间排序
      *

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java

@@ -617,7 +617,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
             MDC.put(log_file_type, log_type);
             log.info("applyTaskToWms-----输入参数{}", param);
             String wmsurl = paramService.findByCode(AcsConfig.WMSURL).getValue();
-            AddressDto addressDto = addressService.findByCode("applyUpdatePointCode");
+            AddressDto addressDto = addressService.findByCode("deviceApplyExceptional");
             String url = wmsurl + addressDto.getMethods_url();
             HttpResponse result2 = null;
             try {

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/InstructionService.java

@@ -453,5 +453,4 @@ public interface InstructionService extends CommonService<InstructionMybatis> {
      */
     Boolean querySameNextDeviceCodeInstByOut(String nextDeviceCode);
 
-    void updateByInstructionCode(Instruction instructionUpdate);
 }

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java

@@ -1,11 +1,9 @@
 package org.nl.acs.instruction.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.stream.CollectorUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -17,7 +15,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
@@ -28,7 +25,6 @@ import org.nl.acs.agv.server.XianGongAgvService;
 import org.nl.acs.auto.initial.ApplicationAutoInitial;
 import org.nl.acs.common.base.CommonFinalParam;
 import org.nl.acs.device.domain.Device;
-import org.nl.acs.device.domain.DeviceErpmapping;
 import org.nl.acs.device.enums.DeviceType;
 import org.nl.acs.device.service.DeviceService;
 import org.nl.acs.device.service.impl.DeviceServiceImpl;
@@ -36,7 +32,6 @@ import org.nl.acs.device_driver.DeviceDriver;
 import org.nl.acs.device_driver.DeviceDriverDefination;
 import org.nl.acs.device_driver.conveyor.belt_conveyor.BeltConveyorDeviceDriver;
 import org.nl.acs.device_driver.conveyor.siemens_conveyor.SiemensConveyorDeviceDriver;
-import org.nl.acs.device_driver.conveyor.standard_conveyor_control.StandardCoveyorControlDeviceDriver;
 import org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver;
 import org.nl.acs.device_driver.conveyor.standard_inspect_site.StandardInspectSiteDeviceDriver;
 import org.nl.acs.device_driver.two_conveyor.hongxiang_device.HongXiangConveyorDeviceDriver;
@@ -1822,13 +1817,8 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
                 .isEmpty();
     }
 
-    @Override
-    public void updateByInstructionCode(Instruction instructionUpdate) {
-        InstructionMybatis entity = ConvertUtil.convert(instructionUpdate, InstructionMybatis.class);
-        UpdateWrapper<InstructionMybatis> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("instruction_code", instructionUpdate.getInstruction_code());
-        instructionMapper.update(entity,updateWrapper);
-    }
+
+
 
     private boolean regional( String start_device_code, String next_device_code) {
         Device startdevice = deviceAppService.findDeviceByCode(start_device_code);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskService.java

@@ -511,5 +511,4 @@ public interface TaskService extends CommonService<Task> {
      */
     TaskDto findByTaskCode(String task_code);
 
-    void updateByTaskCode(Task taskUpdate);
 }

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java

@@ -2,13 +2,12 @@ package org.nl.acs.task.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -30,9 +29,6 @@ import org.nl.acs.device.service.DeviceService;
 import org.nl.acs.device.service.dto.DeviceAssignedDto;
 import org.nl.acs.device.service.impl.DeviceServiceImpl;
 import org.nl.acs.device_driver.DeviceDriverDefination;
-import org.nl.acs.device_driver.RequestMethodEnum;
-import org.nl.acs.ext.wms.data.one.BaseRequest;
-import org.nl.acs.ext.wms.data.one.feedBackTaskStatus.FeedBackTaskStatusRequest;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
 import org.nl.acs.instruction.domain.Instruction;
 import org.nl.acs.instruction.domain.InstructionMybatis;
@@ -48,7 +44,6 @@ import org.nl.acs.route.service.mapper.RoutePlanMapper;
 import org.nl.acs.task.enums.TaskStatusEnum;
 import org.nl.acs.task.enums.TaskTypeEnum;
 import org.nl.acs.task.service.TaskFeedbackService;
-import org.nl.acs.task.service.dto.TaskFeedbackDto;
 import org.nl.acs.common.base.PageInfo;
 import org.nl.acs.common.base.QueryHelpMybatisPlus;
 import org.nl.acs.common.base.impl.CommonServiceImpl;
@@ -75,7 +70,6 @@ import org.springframework.data.domain.Pageable;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.regex.Matcher;
@@ -1541,12 +1535,7 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
         return null;
     }
 
-    @Override
-    public void updateByTaskCode(Task taskUpdate) {
-        UpdateWrapper<Task> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("task_code", taskUpdate.getTask_code());
-        taskMapper.update(taskUpdate,updateWrapper);
-    }
+
 
     /**
      * 把多个字符串拼接的inst_nextDevice_code解析成集合

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java

@@ -15,6 +15,10 @@
  */
 package org.nl.system.service.secutiry.impl;
 
+import cn.dev33.satoken.SaManager;
+import cn.dev33.satoken.config.SaCookieConfig;
+import cn.dev33.satoken.context.SaHolder;
+import cn.dev33.satoken.context.model.SaCookie;
 import cn.dev33.satoken.secure.SaSecureUtil;
 import cn.dev33.satoken.stp.SaLoginModel;
 import cn.dev33.satoken.stp.StpUtil;
@@ -257,6 +261,19 @@ public class OnlineUserService {
                 .setDevice("PC")
                 .setExtra("loginInfo", user)
         );
+        String tokenValue = StpUtil.getTokenValue();
+        SaCookieConfig cfg = SaManager.getConfig().getCookie();
+        SaCookie cookie = new SaCookie()
+                .setName(StpUtil.getTokenValue())
+                .setValue(tokenValue)
+                .setMaxAge(-1)
+                .setDomain(cfg.getDomain())
+                .setPath(cfg.getPath())
+                .setSecure(cfg.getSecure())
+                .setHttpOnly(cfg.getHttpOnly())
+                .setSameSite(cfg.getSameSite())
+                ;
+        SaHolder.getResponse().addCookie(cookie);
 
         // 返回 token 与 用户信息
         JSONObject jsonObject = new JSONObject();

acs2/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml

@@ -9,11 +9,12 @@ spring:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
 #      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:stand_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
-      url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:lzhl_two_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
-#      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lzhl_two_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+#      url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:lzhl_two_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lzhl_two_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
+
       username: ${DB_USER:root}
 #      password: ${DB_PWD:Root.123456}
-      password: ${DB_PWD:p@ssw0rd}
+      password: ${DB_PWD:123456}
       # 初始连接数
       initial-size: 5
       # 最小连接数

acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_device.properties

@@ -14,6 +14,7 @@ one_message14=\u7533\u8BF7\u4EFB\u52A1\u5931\u8D25
 one_message15=\u7533\u8BF7AGV\u642C\u8FD0\u4EFB\u52A1\u63A5\u53E3\u4E0D\u901A
 one_message16=\u7533\u8BF7AGV\u642C\u8FD0\u4EFB\u52A1\u6210\u529F
 one_message17=\u7533\u8BF7AGV\u642C\u8FD0\u4EFB\u52A1\u5931\u8D25
+one_message18=\u672A\u627E\u5230\u66F4\u65B0\u7684\u70B9\u4F4D
 one_mode1=\u7533\u8BF7\u5165\u5E93\u4EFB\u52A1
 one_mode2=\u7533\u8BF7\u7A7A\u6258\u76D8\u5165\u5E93
 one_mode3=\u7533\u8BF7AGV\u4EFB\u52A1

acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_device_en_US.properties

@@ -14,6 +14,8 @@ one_message14=Task request failed
 one_message15=The interface for applying for a complement to the AGV carrying task fails. Procedure
 one_message16=Succeeded in applying for the AGV transfer task. Procedure
 one_message17=Failed to apply for the AGV transfer task. Procedure
+one_message18=No updated point found
+
 one_mode1=Request a warehouse entry task
 one_mode2=Request empty pallets for storage
 one_mode3=Request AGV

acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_device_in_ID.properties

@@ -14,6 +14,8 @@ one_message14=Misi aplikasi gagal
 one_message15=Permintaan kode tambahan AGV memindahkan antarmuka misi tidak tersedia
 one_message16=Minta ijin ke operasi AGV
 one_message17=Aplikasi bantuan AGV pemindahan gagal
+one_message18=Titik pembaruan tidak ditemukan
+
 one_mode1=Berlaku untuk tugas pustaka
 one_mode2=Pendaftaran nampan kosong
 one_mode3=Permintaan  AGV

acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_device_zh_CN.properties

@@ -14,6 +14,8 @@ one_message14=\u7533\u8BF7\u4EFB\u52A1\u5931\u8D25
 one_message15=\u7533\u8BF7\u8865\u7801AGV\u642C\u8FD0\u4EFB\u52A1\u63A5\u53E3\u4E0D\u901A
 one_message16=\u7533\u8BF7\u8865\u7801AGV\u642C\u8FD0\u4EFB\u52A1\u6210\u529F
 one_message17=\u7533\u8BF7\u8865\u7801AGV\u642C\u8FD0\u4EFB\u52A1\u5931\u8D25
+one_message18=\u672A\u627E\u5230\u66F4\u65B0\u7684\u70B9\u4F4D
+
 one_mode1=\u7533\u8BF7\u5165\u5E93\u4EFB\u52A1
 one_mode2=\u7533\u8BF7\u7A7A\u6258\u76D8\u5165\u5E93
 one_mode3=\u7533\u8BF7AGV\u4EFB\u52A1

acs2/nladmin-ui/public/config.js

@@ -1,9 +1,9 @@
 window.g = {
   dev: {
-    VUE_APP_BASE_API: 'http://192.168.101.1:8011'
+    VUE_APP_BASE_API: 'http://127.0.0.1:8011'
   },
   prod: {
-    VUE_APP_BASE_API: 'http://192.168.101.1:8011'
+    VUE_APP_BASE_API: 'http://127.0.0.1:8011'
   }
 
 }

acs2/nladmin-ui/src/views/acs/device/config.vue

@@ -125,6 +125,7 @@ import return_good_manipulator from '@/views/acs/device/driver/one_manipulator/r
 import volume_two_manipulator from '@/views/acs/device/driver/one_manipulator/volume_two_manipulator.vue'
 import box_storage_out_conveyor from '@/views/acs/device/driver/one_conveyor/box_storage_out_conveyor.vue'
 import box_subvolumes_conveyor from '@/views/acs/device/driver/one_conveyor/box_subvolumes_conveyor.vue'
+import manipulator_cache from '@/views/acs/device/driver/one_conveyor/manipulator_cache.vue'
 import finished_product_out_with_bind_lable_conveyor from '@/views/acs/device/driver/one_conveyor/finished_product_out_with_bind_lable_conveyor.vue'
 import fold_disc_site from '@/views/acs/device/driver/one_conveyor/fold_disc_site.vue'
 import scanner_weight_conveyor from '@/views/acs/device/driver/one_conveyor/scanner_weight_conveyor.vue'
@@ -188,7 +189,8 @@ export default {
     xg_agv_car,
     oven_inspect_site,
     manipulator_agv_station,
-    volume_two_manipulator
+    volume_two_manipulator,
+    manipulator_cache
   },
   dicts: ['device_type'],
   mixins: [crud],

acs2/nladmin-ui/src/views/acs/device/driver/one_conveyor/manipulator_cache.vue

@@ -0,0 +1,564 @@
+<template>
+  <!--行架对接缓存位-->
+  <div>
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">设备协议：</span>
+      </div>
+
+      <el-row>
+        <el-col :span="12">
+          OpcServer:
+          <el-select
+            v-model="opc_id"
+            placeholder="无"
+            clearable
+            filterable
+            @change="changeOpc"
+          >
+            <el-option
+              v-for="item in dataOpcservers"
+              :key="item.opc_id"
+              :label="item.opc_name"
+              :value="item.opc_id"
+            />
+          </el-select>
+        </el-col>
+        <el-col :span="12">
+          PLC:
+          <el-select
+            v-model="plc_id"
+            placeholder="无"
+            clearable
+            @change="changePlc"
+          >
+            <el-option
+              v-for="item in dataOpcPlcs"
+              :key="item.plc_id"
+              :label="item.plc_name"
+              :value="item.plc_id"
+            />
+          </el-select>
+        </el-col>
+      </el-row>
+
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">输送系统：</span>
+      </div>
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="电气调度号" label-width="150px">
+              <el-input v-model="form.address" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">指令相关：</span>
+      </div>
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="排：" label-width="150px" prop="x">
+              <el-input v-model.number="form.x" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="列：" label-width="150px" prop="z">
+              <el-input v-model.number="form.z" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="层：" label-width="150px" prop="yY">
+              <el-input v-model.number="form.y" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">AGV相关：</span>
+      </div>
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="取货">
+              <el-switch v-model="form.is_pickup" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="放货">
+              <el-switch v-model="form.is_release" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">PLC读取字段：</span>
+      </div>
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+        <el-table
+          v-loading="false"
+          :data="data1"
+          :max-height="550"
+          size="small"
+          style="width: 100%;margin-bottom: 15px"
+        >
+
+          <el-table-column prop="name" label="用途" />
+          <el-table-column prop="code" label="别名要求" />
+          <el-table-column prop="db" label="DB块">
+            <template slot-scope="scope">
+              <el-input
+                v-model="data1[scope.$index].db"
+                size="mini"
+                class="edit-input"
+                @input="finishReadEdit(data1[scope.$index])"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column prop="dbr_value">
+            <template slot="header">
+              <el-link type="primary" :underline="false" @click.native="test_read1()">测试读</el-link>
+            </template>
+            <template slot-scope="scope">
+              <el-input v-model="data1[scope.$index].dbr_value" size="mini" class="edit-input" />
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">PLC写入字段：</span>
+      </div>
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+        <el-table
+          v-loading="false"
+          :data="data2"
+          :max-height="550"
+          size="small"
+          style="width: 100%;margin-bottom: 15px"
+        >
+
+          <el-table-column prop="name" label="用途" />
+          <el-table-column prop="code" label="别名要求" />
+          <el-table-column prop="db" label="DB块">
+            <template slot-scope="scope">
+              <el-input
+                v-model="data2[scope.$index].db"
+                size="mini"
+                class="edit-input"
+                @input="finishWriteEdit(data2[scope.$index])"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column prop="dbr_value2">
+            <template slot="header">
+              <el-link type="primary" :underline="false" @click.native="test_read2()">测试读</el-link>
+            </template>
+            <template slot-scope="scope">
+              <el-input v-model="data2[scope.$index].dbr_value" size="mini" class="edit-input" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="dbw_value">
+            <template slot="header">
+              <el-link type="primary" :underline="false" @click.native="test_write1()">测试写</el-link>
+            </template>
+            <template slot-scope="scope">
+              <el-input v-model="data2[scope.$index].dbw_value" size="mini" class="edit-input" />
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span" />
+        <el-button
+          :loading="false"
+          icon="el-icon-check"
+          size="mini"
+          style="float: right; padding: 6px 9px"
+          type="primary"
+          @click="doSubmit"
+        >保存
+        </el-button>
+      </div>
+    </el-card>
+
+  </div>
+</template>
+
+<script>
+import {
+  queryDriverConfig,
+  updateConfig,
+  testRead,
+  testwrite
+} from '@/api/acs/device/driverConfig'
+import { selectOpcList } from '@/api/acs/device/opc'
+import { selectPlcList } from '@/api/acs/device/opcPlc'
+import { selectListByOpcID } from '@/api/acs/device/opcPlc'
+
+import crud from '@/mixins/crud'
+import deviceCrud from '@/api/acs/device/device'
+
+export default {
+  name: 'ManipulatorCache',
+  mixins: [crud],
+  props: {
+    parentForm: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      device_code: '',
+      device_id: '',
+      plc_id: '',
+      plc_code: '',
+      address: '',
+      opc_id: '',
+      opc_code: '',
+      configLoading: false,
+      dataOpcservers: [],
+      dataOpcPlcs: [],
+      deviceList: [],
+      data1: [],
+      data2: [],
+      form: {
+        inspect_in_stocck: true,
+        ignore_pickup_check: true,
+        ignore_release_check: true,
+        apply_task: true,
+        link_three_lamp: '',
+        manual_create_task: true,
+        is_pickup: true,
+        is_release: true,
+        link_device_code: [],
+        ship_device_update: true
+      },
+      rules: {}
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      // 从父表单获取设备编码
+      this.device_id = this.$props.parentForm.device_id
+      this.device_code = this.$props.parentForm.device_code
+      queryDriverConfig(
+        this.device_id,
+        this.$props.parentForm.driver_code
+      ).then((data) => {
+        // 给表单赋值，并且属性不能为空
+        if (data.form) {
+          const arr = Object.keys(data.form)
+          // 不为空
+          if (arr.length > 0) {
+            this.form = data.form
+          }
+        }
+
+        // 给表单赋值，并且属性不能为空
+        if (data.parentForm) {
+          const arr = Object.keys(data.parentForm)
+          // 不为空
+          if (arr.length > 0) {
+            this.opc_code = data.parentForm.opc_code
+            this.plc_code = data.parentForm.plc_code
+          }
+        }
+        this.data1 = data.rs
+        this.data2 = data.ws
+        this.sliceItem()
+      })
+      selectPlcList().then((data) => {
+        this.dataOpcPlcs = data
+        this.plc_id = this.$props.parentForm.opc_plc_id
+      })
+      selectOpcList().then((data) => {
+        this.dataOpcservers = data
+        this.opc_id = this.$props.parentForm.opc_server_id
+      })
+      deviceCrud.selectDeviceList().then((data) => {
+        this.deviceList = data
+      })
+    })
+  },
+  methods: {
+    finishReadEdit(data) {
+      // 编辑的是code列,并且值包含mode
+      if (data.code.indexOf('mode') !== -1) {
+        const dbValue = data.db
+        // .之前的字符串
+        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // .之后的字符串
+        const afterStr = dbValue.match(/\.(\S*)/)[1]
+        // 取最后数字
+        const endNumber = afterStr.substring(1)
+        // 最后为非数字
+        if (isNaN(parseInt(endNumber))) {
+          return
+        }
+        for (const val in this.data1) {
+          if (this.data1[val].code.indexOf('mode') !== -1) {
+            this.data1[val].db =
+              beforeStr +
+              '.' +
+              afterStr.substring(0, 1) +
+              (parseInt(endNumber) + 0)
+          }
+          if (this.data1[val].code.indexOf('move') !== -1) {
+            this.data1[val].db =
+              beforeStr +
+              '.' +
+              afterStr.substring(0, 1) +
+              (parseInt(endNumber) + 1)
+          }
+          if (this.data1[val].code.indexOf('carrier_direction') !== -1) {
+            this.data1[val].db =
+              beforeStr +
+              '.' +
+              afterStr.substring(0, 1) +
+              (parseInt(endNumber) + 2)
+          }
+          if (this.data1[val].code.indexOf('error') !== -1) {
+            this.data1[val].db =
+              beforeStr +
+              '.' +
+              afterStr.substring(0, 1) +
+              (parseInt(endNumber) + 4)
+          }
+          if (this.data1[val].code.indexOf('task') !== -1) {
+            this.data1[val].db =
+              beforeStr + '.' + 'D' + (parseInt(endNumber) + 8)
+          }
+        }
+      }
+    },
+    finishWriteEdit(data) {
+      // 编辑的是code列,并且值包含mode
+      if (data.code.indexOf('to_command') !== -1) {
+        const dbValue = data.db
+        // .之前的字符串
+        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // .之后的字符串
+        const afterStr = dbValue.match(/\.(\S*)/)[1]
+        // 取最后数字
+        const endNumber = afterStr.substring(1)
+        // 最后为非数字
+        if (isNaN(parseInt(endNumber))) {
+          return
+        }
+        console.log(endNumber)
+        for (const val in this.data2) {
+          if (this.data2[val].code.indexOf('to_command') !== -1) {
+            this.data2[val].db =
+              beforeStr +
+              '.' +
+              afterStr.substring(0, 1) +
+              (parseInt(endNumber) + 0)
+          }
+          if (this.data2[val].code.indexOf('to_target') !== -1) {
+            this.data2[val].db =
+              beforeStr +
+              '.' +
+              afterStr.substring(0, 1) +
+              (parseInt(endNumber) + 2)
+          }
+          if (this.data2[val].code.indexOf('to_container_type') !== -1) {
+            this.data2[val].db =
+              beforeStr +
+              '.' +
+              afterStr.substring(0, 1) +
+              (parseInt(endNumber) + 4)
+          }
+          if (this.data2[val].code.indexOf('to_task') !== -1) {
+            this.data2[val].db =
+              beforeStr + '.' + 'D' + (parseInt(endNumber) + 6)
+          }
+          if (this.data2[val].code.indexOf('to_strap_times') !== -1) {
+            this.data2[val].db =
+              beforeStr +
+              '.' +
+              afterStr.substring(0, 1) +
+              (parseInt(endNumber) + 10)
+          }
+          if (this.data2[val].code.indexOf('to_length') !== -1) {
+            this.data2[val].db =
+              beforeStr +
+              '.' +
+              afterStr.substring(0, 1) +
+              (parseInt(endNumber) + 12)
+          }
+          if (this.data2[val].code.indexOf('to_weight') !== -1) {
+            this.data2[val].db =
+              beforeStr +
+              '.' +
+              afterStr.substring(0, 1) +
+              (parseInt(endNumber) + 14)
+          }
+          if (this.data2[val].code.indexOf('to_height') !== -1) {
+            this.data2[val].db =
+              beforeStr +
+              '.' +
+              afterStr.substring(0, 1) +
+              (parseInt(endNumber) + 16)
+          }
+        }
+      }
+    },
+    changeOpc(val) {
+      this.dataOpcservers.forEach((item) => {
+        if (item.opc_id === val) {
+          this.opc_code = item.opc_code
+        }
+      })
+
+      selectListByOpcID(val).then((data) => {
+        this.dataOpcPlcs = data
+        this.plc_id = ''
+        this.plc_code = ''
+        if (this.dataOpcPlcs && this.dataOpcPlcs.length > 0) {
+          this.plc_id = this.dataOpcPlcs[0].plc_id
+          this.plc_code = this.dataOpcPlcs[0].plc_code
+        }
+        this.sliceItem()
+      })
+    },
+    changePlc(val) {
+      this.dataOpcPlcs.forEach((item) => {
+        if (item.plc_id === val) {
+          this.plc_code = item.plc_code
+          this.sliceItem()
+          return
+        }
+      })
+    },
+    test_read1() {
+      testRead(this.data1, this.opc_id)
+        .then((data) => {
+          this.data1 = data
+          console.log(this.data1)
+          this.notify('操作成功!', 'success')
+        })
+        .catch((err) => {
+          console.log(err.response.data.message)
+        })
+    },
+    test_write1() {
+      testwrite(this.data2, this.opc_id)
+        .then((data) => {
+          this.notify('操作成功!', 'success')
+        })
+        .catch((err) => {
+          console.log(err.response.data.message)
+        })
+    },
+    test_read2() {
+      testRead(this.data2, this.opc_id)
+        .then((data) => {
+          this.data2 = data
+          console.log(this.data2)
+          this.notify('操作成功!', 'success')
+        })
+        .catch((err) => {
+          console.log(err.response.data.message)
+        })
+    },
+    doSubmit() {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.configLoading = true
+          // 根据驱动类型判断是否为路由设备
+          const parentForm = this.parentForm
+          parentForm.is_route = true
+          parentForm.plc_id = this.plc_id
+          parentForm.opc_id = this.opc_id
+          updateConfig(parentForm, this.form, this.data1, this.data2)
+            .then((res) => {
+              this.notify('保存成功', 'success')
+              this.configLoading = false
+            })
+            .catch((err) => {
+              this.configLoading = false
+              console.log(err.response.data.message)
+            })
+        }
+      })
+    },
+    sliceItem() {
+      // 拼接DB的Item值
+      this.data1.forEach((item) => {
+        const str = item.code
+        // 是否包含.
+        if (str.search('.') !== -1) {
+          // 截取最后一位
+          item.code =
+            this.opc_code +
+            '.' +
+            this.plc_code +
+            '.' +
+            this.device_code +
+            '.' +
+            str.slice(str.lastIndexOf('.') + 1)
+        } else {
+          item.code =
+            this.opc_code +
+            '.' +
+            this.plc_code +
+            '.' +
+            this.device_code +
+            '.' +
+            item.code
+        }
+      })
+      this.data2.forEach((item) => {
+        const str = item.code
+        // 是否包含.
+        if (str.search('.') !== -1) {
+          // 截取最后一位
+          item.code =
+            this.opc_code +
+            '.' +
+            this.plc_code +
+            '.' +
+            this.device_code +
+            '.' +
+            str.slice(str.lastIndexOf('.') + 1)
+        } else {
+          item.code =
+            this.opc_code +
+            '.' +
+            this.plc_code +
+            '.' +
+            this.device_code +
+            '.' +
+            item.code
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

lms/nladmin-system/src/main/java/org/nl/wms/autotask/CleanTask.java

@@ -0,0 +1,27 @@
+package org.nl.wms.autotask;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.modules.wql.core.bean.WQLObject;
+import org.nl.system.service.param.ISysParamService;
+import org.springframework.stereotype.Component;
+
+/**
+ * 自动清除日志(操作日志、异常日志)数据
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class CleanTask {
+    private final ISysParamService paramService;
+
+    public void run() {
+        //delete from  sys_log where DATE(create_time) <= DATE(DATE_SUB(NOW(),INTERVAL 30 day)) limit 10;
+        WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");
+        int days = Integer.parseInt(paramService.findByCode("task_day").getValue());
+        taskTab.delete("DATE(create_time) <= DATE(DATE_SUB(NOW(),INTERVAL " + days + " day))");
+
+        log.info("自动清理任务执行成功...!");
+    }
+
+}

lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/MaterialbaseController.java

@@ -83,15 +83,6 @@ public class MaterialbaseController {
         return new ResponseEntity<>(MaterOptTypeEnum.getObj(materOpt_code), HttpStatus.OK);
     }
 
-    @PostMapping("/synchronize")
-    @Log("物料同步")
-
-    //@PreAuthorize("@el.check('materialtype:list')")
-    public ResponseEntity<Object> synchronize(@RequestBody Map whereJson) {
-        materialBaseService.synchronize(whereJson);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
     @Log("查询产品系列类型")
 
     @GetMapping("/getProductSeries")

lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/MaterialbaseService.java

@@ -88,8 +88,6 @@ public interface MaterialbaseService {
      */
     JSONObject getMaterOptType(String materOpt_code);
 
-    void synchronize(Map whereJson);
-
     JSONArray getProductSeries(String parent_class_id);
 
 

lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java

@@ -39,7 +39,6 @@ import java.util.Set;
 @Slf4j
 public class MaterialbaseServiceImpl implements MaterialbaseService {
     private final ClassstandardService classstandardService;
-    //private final WmsToErpService wmsToErpService;
 
     @Override
     public Map<String, Object> queryAll(Map whereJson, Pageable page) {
@@ -214,12 +213,6 @@ public class MaterialbaseServiceImpl implements MaterialbaseService {
         return MaterOptTypeEnum.getObj(materOpt_code);
     }
 
-    @Override
-    public void synchronize(Map whereJson) {
-       /* wmsToErpService.getClassInfo(null);
-        wmsToErpService.getMaterialInfo(null);*/
-    }
-
     @Override
     public JSONArray getProductSeries(String parent_class_id) {
         WQLObject wo = WQLObject.getWQLObject("MD_PB_ClassStandard");

lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql

@@ -55,11 +55,13 @@
             SELECT
                 task.*,
                 md.class_name task_type_name,
+                user.person_name AS create_name1,
                 dict.label task_status_name,
                 case when task.task_type like '0105%' then 'LK' ELSE task.product_area end AS final_product_area
             FROM
                 sch_base_task task
                 LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code
+                LEFT JOIN sys_user user ON user.username = task.create_name
                 LEFT JOIN sys_dict dict ON dict.`value` = task.task_status AND dict.`code` = 'task_status'
             WHERE
                 1=1

lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql

@@ -340,57 +340,6 @@
         ENDQUERY
     ENDIF
 
-    IF 输入.flag = "8"
-        		PAGEQUERY
-                    SELECT
-                    	pp.CREATE_DATE AS receive_date,
-                    	pp.VBILLCODE AS source_bill_code,
-                    	mb.material_code,
-                    	mb.material_name,
-                    	class.class_desc,
-                    	mb.material_id,
-                    	pp.QTY AS receive_qty,
-                    	( CASE WHEN a.real_qty IS NULL THEN pp.QTY ELSE ( pp.QTY - a.real_qty ) END ) AS need_qty,
-                    	mu.unit_name AS qty_unit_name,
-                    	'采购订单' AS source_type_name,
-                    	mu.measure_unit_id AS qty_unit_id,
-                    	pp.id AS source_billdtl_id,
-                    	'PO' AS source_bill_type,
-                    	'PCS_IF_PurchaseOrderProc' AS source_bill_table,
-                    	pp.id AS base_billdtl_id,
-                    	'PO' AS base_bill_type,
-                    	'' AS base_bill_code,
-                    	'PCS_IF_PurchaseOrderProc' AS base_bill_table
-                    FROM
-                    	pcs_if_purchaseorderproc pp
-                    	LEFT JOIN md_me_materialbase mb ON mb.ext_id = pp.ITEM_ID
-                    	INNER JOIN md_pb_classstandard class ON class.class_id = mb.material_type_id
-                    	INNER JOIN md_pb_measureunit mu ON mu.ext_id = pp.M_UNIT_ID
-                    	LEFT JOIN ( SELECT dtl.source_billdtl_id, SUM( dtl.real_qty ) AS real_qty FROM st_ivt_iostorinvdtl dtl GROUP BY source_billdtl_id ) a ON a.source_billdtl_id = pp.id
-                    WHERE
-                    	pp.proc_status IN ( '01', '02' )
-                    AND
-                        pp.DR='0'
-                    AND
-                        mb.material_type_id IN 输入.clsss_ids
-                    OPTION 输入.material_search <> ""
-                        (mb.material_code like 输入.material_search
-                        OR
-                        mb.material_name like 输入.material_search)
-                    ENDOPTION
-                    OPTION 输入.bill_code <> ""
-                        pp.VBILLCODE like 输入.bill_code
-                    ENDOPTION
-                    OPTION 输入.begin_time <> ""
-                        pp.CREATE_DATE >= 输入.begin_time
-                    ENDOPTION
-                    OPTION 输入.end_time <> ""
-                        pp.CREATE_DATE <= 输入.end_time
-                    ENDOPTION
-        	        ENDSELECT
-                ENDPAGEQUERY
-        ENDIF
-
         IF 输入.flag = "9"
             PAGEQUERY
                 SELECT

lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/SendReceiveQuery.wql

@@ -18,7 +18,6 @@
 	输入.begin_time				    	         TYPEAS s_string
 	输入.end_time				    	         TYPEAS s_string
 	输入.material_code				    	     TYPEAS s_string
-	输入.classIds			                     TYPEAS f_string
 	输入.pcsn			                         TYPEAS s_string
 	输入.sap_pcsn			                     TYPEAS s_string
 	输入.package_box_sn			                 TYPEAS s_string
@@ -53,14 +52,9 @@
 			    stor.stor_name,
 			    da.sect_date,
             	da.pcsn,
-            	da.quality_scode,
-                class.class_name,
-                class.class_code,
                 mater.material_id,
                 mater.material_code,
                 mater.material_name,
-                mater.material_model,
-                unit.unit_name,
                 da.start_num,
                 da.in_num,
                 da.out_num,
@@ -77,22 +71,17 @@
                     sum(end_num) AS end_num,
                     sum(more_num) AS more_num,
                     sum(less_num) AS less_num,
-                    max(material_id) AS material_id,
+                    max( material_id ) AS material_id,
                     max(stor_id) AS stor_id,
-                    max(sect_date) AS sect_date,
-                    max(quality_scode) AS quality_scode,
-                    max(pcsn) AS pcsn
+                    sect_date,
+                    pcsn
                 FROM
                     ST_IVT_IOStorDaily a
                 GROUP BY
-                    a.material_id,
-                    a.quality_scode,
                     a.pcsn,
                     a.sect_date
                 ) AS da
             LEFT JOIN MD_ME_MaterialBase mater ON da.material_id = mater.material_id
-            LEFT JOIN md_pb_classstandard class ON mater.material_type_id = class.class_id
-            LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = mater.base_unit_id
             LEFT JOIN st_ivt_bsrealstorattr stor ON stor.stor_id = da.stor_id
             LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = da.pcsn
             WHERE 1=1
@@ -127,10 +116,6 @@
                         sub.package_box_sn like 输入.package_box_sn
                 ENDOPTION
 
-                OPTION 输入.classIds <> ""
-                         class.class_id in 输入.classIds
-                ENDOPTION
-
 			ENDSELECT
 		ENDPAGEQUERY
 	ENDIF

lms/nladmin-ui/src/views/login.vue

@@ -56,7 +56,7 @@ export default {
       cookiePass: '',
       loginForm: {
         username: 'admin',
-        password: '123456',
+        password: '',
         rememberMe: false,
         code: '',
         uuid: ''

lms/nladmin-ui/src/views/wms/basedata/master/material/index.vue

@@ -36,18 +36,7 @@
         </el-col>
       </el-row>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission">
-        <el-button
-          slot="right"
-          class="filter-item"
-          type="success"
-          icon="el-icon-position"
-          size="mini"
-          @click="synchronize()"
-        >
-          同步
-        </el-button>
-      </crudOperation>
+      <crudOperation/>
       <!--表单组件-->
       <el-dialog
         :close-on-click-modal="false"
@@ -349,15 +338,6 @@ export default {
         }
       })
     },
-    synchronize() {
-      this.fullscreenLoading = true
-      crudMaterialbase.synchronize(this.crud.query).then(res => {
-        this.fullscreenLoading = false
-        this.crud.notify('同步成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
-      }).catch(() => {
-        this.fullscreenLoading = false
-      })
-    },
     queryClassId() {
       const param = {
         'class_idStr': this.class_idStr

lms/nladmin-ui/src/views/wms/basedata/master/material/materialbase.js

@@ -40,14 +40,6 @@ export function isAlongMaterType(data) {
   })
 }
 
-export function synchronize(data) {
-  return request({
-    url: 'api/Materialbase/synchronize',
-    method: 'post',
-    data
-  })
-}
-
 export function getProductSeries() {
   return request({
     url: 'api/Materialbase/getProductSeries',
@@ -55,4 +47,4 @@ export function getProductSeries() {
   })
 }
 
-export default { add, edit, del, getMaterOptType, isAlongMaterType, synchronize, getProductSeries }
+export default { add, edit, del, getMaterOptType, isAlongMaterType, getProductSeries }

lms/nladmin-ui/src/views/wms/pdm/ivt/cutpointivt/index.vue

@@ -175,7 +175,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="remark" label="备注" />
-        <el-table-column prop="update_time" label="修改时间" min-width="150" show-overflow-tooltip />
+        <el-table-column prop="update_time" label="修改时间" min-width="151" show-overflow-tooltip />
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation

lms/nladmin-ui/src/views/wms/pdm/ivt/package/index.vue

@@ -174,7 +174,7 @@
             {{ dict.label.is_used[scope.row.is_used] }}
           </template>
         </el-table-column>
-        <el-table-column prop="update_time" label="修改时间" show-overflow-tooltip />
+        <el-table-column prop="update_time" label="修改时间" show-overflow-tooltip width="150px;"/>
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation

lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue

@@ -467,7 +467,7 @@
         <el-table-column prop="is_child_tz_ok" label="子卷套轴完成" width="100px" :formatter="formatChildName"/>
         <el-table-column prop="is_child_ps_ok" label="子卷配送完成" width="100px" :formatter="formatChildPsName"/>
         <el-table-column prop="is_call" label="是否呼叫" width="100px" :formatter="formatChildCallName"/>
-        <el-table-column prop="qzzno" label="气涨轴编码" width="150px"/>
+        <el-table-column prop="qzzno" label="气涨轴编码" width="160px"/>
         <el-table-column prop="start_time" label="开始时间" width="150px"/>
         <el-table-column prop="end_time" label="结束时间" width="150px"/>
         <!--      <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">

lms/nladmin-ui/src/views/wms/sch/point/index.vue

@@ -199,7 +199,7 @@
         >
           仓位同步
         </el-button>-->
-        <el-button
+<!--        <el-button
           slot="right"
           class="filter-item"
           type="success"
@@ -208,7 +208,7 @@
           @click="downdtl"
         >
           导出Excel
-        </el-button>
+        </el-button>-->
       </crudOperation>
       <!--表单组件-->
       <el-dialog
@@ -427,6 +427,8 @@ export default {
     crudPoint.getRegion().then(res => {
       this.regionList = res
     })
+    this.$set(this.query, 'region_id', '1582991348217286656')
+    this.crud.toQuery()
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据

lms/nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue

@@ -131,17 +131,6 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label="单据日期">
-            <el-date-picker
-              v-model="query.createTime"
-              type="daterange"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-              @change="crud.toQuery"
-            />
-          </el-form-item>
           <el-form-item label="模糊查询">
             <el-input
               v-model="query.bill_code"
@@ -168,6 +157,17 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="单据日期">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
           <rrOperation />
         </el-form>
       </div>

lms/nladmin-ui/src/views/wms/st/inStor/check/index.vue

@@ -176,14 +176,14 @@
             <el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.check_code }}</el-link>
           </template>
         </el-table-column>
-        <el-table-column show-overflow-tooltip :formatter="stateFormat" width="150" prop="status" label="单据状态" />
+        <el-table-column show-overflow-tooltip :formatter="stateFormat" width="110" prop="status" label="单据状态" />
         <el-table-column prop="stor_name" label="仓库" width="120" />
-        <el-table-column show-overflow-tooltip prop="check_type" :formatter="bill_typeFormat" width="150" label="业务类型" />
-        <el-table-column show-overflow-tooltip prop="is_nok" :formatter="is_nokFormat" width="150" label="盘点状态" />
-        <el-table-column show-overflow-tooltip :formatter="create_modeFormat" prop="create_mode" label="生成方式" width="150" />
-        <el-table-column label="箱数" align="center" prop="dtl_num" width="150" />
-        <el-table-column label="子卷数" align="center" prop="pcsn_num" width="150" />
-        <el-table-column show-overflow-tooltip prop="input_time" width="170" label="创建日期" />
+        <el-table-column show-overflow-tooltip prop="check_type" :formatter="bill_typeFormat" width="110" label="业务类型" />
+        <el-table-column show-overflow-tooltip prop="is_nok" :formatter="is_nokFormat" width="90" label="盘点状态" />
+        <el-table-column show-overflow-tooltip :formatter="create_modeFormat" prop="create_mode" label="生成方式" width="110" />
+        <el-table-column label="箱数" align="center" prop="dtl_num" width="110" />
+        <el-table-column label="子卷数" align="center" prop="pcsn_num" width="110" />
+        <el-table-column show-overflow-tooltip prop="input_time" width="151" label="创建日期" />
       </el-table>
       <!--分页组件-->
       <pagination />

lms/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue

@@ -142,7 +142,7 @@
       <el-table-column show-overflow-tooltip width="150" prop="product_description" label="物料描述" />
       <el-table-column show-overflow-tooltip prop="width" label="幅宽" />
       <el-table-column show-overflow-tooltip prop="thickness" label="产品厚度" />
-      <el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="170" fixed="right">
+      <el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="120" fixed="right">
         <template scope="scope">
           <el-button
             type="danger"

lms/nladmin-ui/src/views/wms/st/inbill/index.vue

@@ -225,7 +225,7 @@
           </template>
         </el-table-column>
         <el-table-column show-overflow-tooltip :formatter="stateFormat" prop="bill_status" label="单据状态" />
-        <el-table-column prop="stor_name" label="仓库" />
+        <el-table-column prop="stor_name" label="仓库" width="100px;"/>
         <el-table-column show-overflow-tooltip prop="bill_type" min-width="120" :formatter="bill_typeFormat" label="业务类型" />
         <el-table-column show-overflow-tooltip min-width="120" prop="biz_date" label="业务日期" />
         <el-table-column show-overflow-tooltip prop="create_mode" :formatter="create_modeFormat" label="生成方式" />
@@ -237,9 +237,9 @@
         </el-table-column>
         <el-table-column label="交货单" align="center" prop="vbeln" width="150px" />
         <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="制单人" align="center" prop="input_optname" />
+        <el-table-column label="制单人" align="center" prop="input_optname" width="100px;"/>
         <el-table-column label="制单时间" align="center" prop="input_time" width="150" />
-        <el-table-column label="修改人" align="center" prop="update_optname" />
+        <el-table-column label="修改人" align="center" prop="update_optname" width="100px;"/>
         <el-table-column label="修改时间" align="center" prop="update_time" width="150" />
         <el-table-column label="分配人" align="center" prop="dis_optname" width="140px" />
         <el-table-column label="分配时间" align="center" prop="dis_time" width="150" />

lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue

@@ -243,7 +243,7 @@
           <span>{{ scope.row.remark }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="160" fixed="right">
+      <el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="120" fixed="right">
         <template scope="scope">
           <el-button type="danger" class="filter-item" size="mini" icon="el-icon-delete" @click.native.prevent="deleteRow(scope.$index, form.tableData)" />
         </template>

lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue

@@ -277,7 +277,7 @@
         <el-table-column show-overflow-tooltip prop="instorage_time" width="150px" label="入库时间" align="center" />
         <el-table-column show-overflow-tooltip prop="task_code" width="150px" label="任务号" align="center" />
         <el-table-column show-overflow-tooltip prop="point_code" width="150px" label="出库点" align="center" />
-        <el-table-column align="center" label="操作" width="160" fixed="right">
+        <el-table-column align="center" label="操作" width="120" fixed="right">
           <template scope="scope">
             <el-button :disabled="tabledisabled(scope.row)" type="danger" class="filter-item" size="mini" icon="el-icon-delete" @click.native.prevent="deleteRow(scope.row)" />
           </template>

lms/nladmin-ui/src/views/wms/stat/pastivt/index.vue

@@ -129,17 +129,6 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label="生产日期">
-            <el-date-picker
-              v-model="query.createTime"
-              type="daterange"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-              @change="crud.toQuery"
-            />
-          </el-form-item>
 
           <el-form-item label="客户编码">
             <el-input
@@ -153,6 +142,17 @@
             />
           </el-form-item>
 
+          <el-form-item label="生产日期">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
           <el-form-item label="是否超期">
             <el-switch
               v-model="query.is_sid"
@@ -213,7 +213,7 @@
         <el-table-column show-overflow-tooltip prop="date_of_fg_inbound" label="入库日期" :min-width="flexWidth('date_of_fg_inbound',crud.data,'入库日期')" />
         <el-table-column show-overflow-tooltip prop="box_weight" label="木箱自身重量" :min-width="flexWidth('box_weight',crud.data,'木箱自身重量')" />
         <el-table-column show-overflow-tooltip prop="quality_guaran_period" label="保质期" :min-width="flexWidth('quality_guaran_period',crud.data,'保质期')" />
-        <el-table-column show-overflow-tooltip prop="un_plan_product_property1" label="子卷的悟性值1" :min-width="flexWidth('un_plan_product_property1',crud.data,'子卷的悟性值1')" />
+        <el-table-column show-overflow-tooltip prop="un_plan_product_property1" label="子卷的悟性值1" width="2100px;" />
         <el-table-column show-overflow-tooltip prop="un_plan_product_property2" label="子卷的悟性值2" :min-width="flexWidth('un_plan_product_property2',crud.data,'子卷的悟性值2')" />
         <el-table-column show-overflow-tooltip prop="un_plan_product_property3" label="子卷的悟性值3" :min-width="flexWidth('un_plan_product_property3',crud.data,'子卷的悟性值3')" />
         <el-table-column show-overflow-tooltip prop="box_type" label="木箱料号" :min-width="flexWidth('box_type',crud.data,'木箱料号')" />

lms/nladmin-ui/src/views/wms/statistics/sendReceiveQuery/index.vue

@@ -96,25 +96,15 @@
       <el-table ref="table" :cell-style="cellStyleMst" show-summary :summary-method="getSum" :max-height="590" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column prop="stor_name" label="仓库"/>
         <el-table-column prop="sect_date" label="日期" width="100px" />
-<!--        <el-table-column prop="class_code" label="物料分类编码" width="100px" />-->
-<!--        <el-table-column prop="class_name" label="物料分类名称" width="100px" />-->
         <el-table-column prop="material_code" label="物料编码" min-width="150" show-overflow-tooltip/>
         <el-table-column prop="material_name" label="物料名称" min-width="150" show-overflow-tooltip/>
         <el-table-column prop="material_model" label="规格/型号" min-width="150" show-overflow-tooltip/>
-        <el-table-column prop="unit_name" label="主单位"/>
         <el-table-column prop="pcsn" label="批次号" min-width="140" show-overflow-tooltip/>
         <el-table-column prop="sap_pcsn" label="sap批次" min-width="120" show-overflow-tooltip/>
         <el-table-column prop="package_box_sn" label="木箱号" width="250px" min-width="120" show-overflow-tooltip/>
-
-        <!--        <el-table-column prop="dept_name" label="所属组织" min-width="120" show-overflow-tooltip/>-->
-<!--        <el-table-column prop="quality_scode" label="品质类型" :formatter="formatQualityName" />-->
-<!--        <el-table-column prop="ivt_level" label="质量等级" :formatter="formatIvtName" />-->
-<!--        <el-table-column prop="is_active" label="是否可用" :formatter="formatIsName" />-->
         <el-table-column prop="start_num" label="期初主数量" :formatter="crud.formatNum3" width="100px" />
         <el-table-column prop="in_num" label="入库主数量" :formatter="crud.formatNum3" width="100px" />
         <el-table-column prop="out_num" label="出库主数量" :formatter="crud.formatNum3" width="100px" />
-<!--        <el-table-column prop="less_num" label="其他出" :formatter="crud.formatNum3"/>-->
-<!--        <el-table-column prop="more_num" label="其他入" :formatter="crud.formatNum3"/>-->
         <el-table-column prop="end_num" label="结存主数量" :formatter="crud.formatNum3" width="100px" />
       </el-table>
       <!--分页组件-->