rev:更新

nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java

@@ -68,7 +68,6 @@ public class AppRun {
         return "Backend service started successfully";
     }
 
-
     @GetMapping("/{device_code}")
     @SaIgnore
     public String withStationRequireSuccess(@PathVariable String device_code) {
@@ -81,6 +80,7 @@ public class AppRun {
         return device_code + "关联站点请求标记复位成功!";
     }
   
+
     @GetMapping("/get/{device_code}")
     @SaIgnore
     public String getWithStationRequireSuccess(@PathVariable String device_code) {

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/appearance_inspection_scannner_conveyor/AppearanceInspectionScannerConveyorDeviceDriver.java

@@ -234,6 +234,13 @@ public class AppearanceInspectionScannerConveyorDeviceDriver extends AbstractOpc
     private volatile String reqPutInstCode = null;
     private volatile Boolean reqPutRequireSuccess = false;
 
+    /**
+     * 称重是否异常标记，如果异常,则显示在点阵屏上
+     * 光电无货时,清除标记和消息
+     */
+    private boolean isWeightError = false;
+    private String weightErrorMsg = null;
+
 
     @Override
     public Device getDevice() {
@@ -268,6 +275,10 @@ public class AppearanceInspectionScannerConveyorDeviceDriver extends AbstractOpc
         if (this.move != this.lastMove) {
             this.requireSuccess = false;
             this.withStationRequireSuccess = false;
+            if (this.move == 0) {
+                this.isWeightError = false;
+                this.weightErrorMsg = null;
+            }
         }
         if (this.error != this.lastError && this.error != 0) {
             if (this.status == 1) {
@@ -504,6 +515,7 @@ public class AppearanceInspectionScannerConveyorDeviceDriver extends AbstractOpc
             JSONObject param = new JSONObject();
             param.put("vehicle_code", this.barcode);
             param.put("start_point", this.currentDeviceCode);
+            param.put("weight", this.weight);
             param.put("height", this.height);
             CommonRequest<JSONObject> request =
                     CommonRequest.<JSONObject>builder()
@@ -518,18 +530,24 @@ public class AppearanceInspectionScannerConveyorDeviceDriver extends AbstractOpc
             } else {
                 if (isErrorTimeValid(currentTimeMillis)) {
                     this.errorRequireTime = currentTimeMillis;
-                    String notifyValue = Optional.ofNullable(sysParamService.findByCode("is_notify"))
+                    String message = response.getMessage();
-                            .map(notify -> notify.getValue())
+                    if (message != null && message.contains("weightError")) {
-                            .orElse("0");
+                        this.isWeightError = true;
-                    if (notifyValue.equals("1")) {
+                        this.weightErrorMsg = message;
-                        JSONObject dataParam = new JSONObject();
+                    } else {
-                        dataParam.put("msg", "申请任务失败! 请求参数: " + request + "响应信息: " + response.getMessage());
+                        String notifyValue = Optional.ofNullable(sysParamService.findByCode("is_notify"))
-                        CommonRequest<JSONObject> requestParam = CommonRequest.<JSONObject>builder()
+                                .map(notify -> notify.getValue())
-                                .service("ErrorInfo")
+                                .orElse("0");
-                                .type("1")
+                        if (notifyValue.equals("1")) {
-                                .data(dataParam)
+                            JSONObject dataParam = new JSONObject();
-                                .build();
+                            dataParam.put("msg", "申请任务失败! 请求参数: " + request + "响应信息: " + response.getMessage());
-                        acsToWmsService.apply(requestParam);
+                            CommonRequest<JSONObject> requestParam = CommonRequest.<JSONObject>builder()
+                                    .service("ErrorInfo")
+                                    .type("1")
+                                    .data(dataParam)
+                                    .build();
+                            acsToWmsService.apply(requestParam);
+                        }
                     }
                 }
             }

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/screen/led_screen/LedScreenDeviceDriver.java

@@ -331,9 +331,13 @@ public class LedScreenDeviceDriver extends AbstractDeviceDriver implements Devic
                 Device device = deviceAppService.findDeviceByCode(deviceCode);
                 if (device != null && device.getDeviceDriver() instanceof AppearanceInspectionScannerConveyorDeviceDriver) {
                     AppearanceInspectionScannerConveyorDeviceDriver appearanceInspectionScannerConveyorDeviceDriver = (AppearanceInspectionScannerConveyorDeviceDriver) device.getDeviceDriver();
-                    if (appearanceInspectionScannerConveyorDeviceDriver.getError() > 0) {
+                    if (appearanceInspectionScannerConveyorDeviceDriver.getError() > 0 || appearanceInspectionScannerConveyorDeviceDriver.isWeightError()) {
-                        String label = ErrorEnum.getLabel(appearanceInspectionScannerConveyorDeviceDriver.getError());
+                        if (appearanceInspectionScannerConveyorDeviceDriver.getError() > 0) {
-                        errorMsg = "设备" + deviceCode + " " + label + ",";
+                            String label = ErrorEnum.getLabel(appearanceInspectionScannerConveyorDeviceDriver.getError());
+                            errorMsg = "设备" + deviceCode + " " + label + ",";
+                        } else if (appearanceInspectionScannerConveyorDeviceDriver.isWeightError()) {
+                            errorMsg = "设备" + deviceCode + "称重异常: " + appearanceInspectionScannerConveyorDeviceDriver.getWeightErrorMsg() + ",";
+                        }
                     }
                 } else if (device != null && device.getDeviceDriver() instanceof StandardStackerDeviceDriver) {
                     StandardStackerDeviceDriver standardStackerDeviceDriver = (StandardStackerDeviceDriver) device.getDeviceDriver();
@@ -413,9 +417,9 @@ public class LedScreenDeviceDriver extends AbstractDeviceDriver implements Devic
 
     private void sendInformation(String modeMsg, String errorMsg, String taskMsg) throws Bx6GException {
         DisplayStyle[] styles = DisplayStyleFactory.getStyles().toArray(new DisplayStyle[0]);
-        writeModeMsg(modeMsg,styles);
+        writeModeMsg(modeMsg, styles);
-        writeErrorMsg(errorMsg,styles);
+        writeErrorMsg(errorMsg, styles);
-        writeTaskMsg(taskMsg,styles);
+        writeTaskMsg(taskMsg, styles);
     }
 
     private void writeModeMsg(String modeMsg, DisplayStyle[] styles) throws Bx6GException {
@@ -429,7 +433,7 @@ public class LedScreenDeviceDriver extends AbstractDeviceDriver implements Devic
         this.screen.writeProgram(pf);
     }
 
-    private void writeErrorMsg(String errorMsg, DisplayStyle[] styles){
+    private void writeErrorMsg(String errorMsg, DisplayStyle[] styles) {
         DynamicBxAreaRule rule_2 = new DynamicBxAreaRule();
         rule_2.setId(0);
         rule_2.setRunMode((byte) 0);
@@ -450,7 +454,7 @@ public class LedScreenDeviceDriver extends AbstractDeviceDriver implements Devic
         this.screen.writeDynamic(rule_2, area_2);
     }
 
-    private void writeTaskMsg(String taskMsg, DisplayStyle[] styles){
+    private void writeTaskMsg(String taskMsg, DisplayStyle[] styles) {
         DynamicBxAreaRule rule = new DynamicBxAreaRule();
         rule.setId(1);
         rule.setRunMode((byte) 0);

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/stacker/double_stacker/StandardStackerDeviceDriver.java

@@ -1489,6 +1489,13 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
                         //查询对应的浅库位是否存在就绪的指令信息
                         Instruction shallInst = instructionService.findReadyInstByStartPointCode(shallStartPointCode);
                         if (shallInst != null) {
+                            //判断该任务终点是否前叉可达,如果不可达结束
+                            if(!getFrontDeviceCodeList.contains(shallInst.getNext_device_code()) && getBackDeviceCodeList.contains(shallInst.getNext_device_code())){
+                                this.backWrite(shallInst);
+                                this.unExecutedMessage = null;
+                                this.requireSuccess = true;
+                                return;
+                            }
                             frontInst = shallInst;
                             break;
                         }

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

@@ -183,11 +183,11 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
 
                 TaskDto taskDto = taskService.findByCodeFromCache(task_code);
                 if (taskDto != null) {
-                    JSONObject json = new JSONObject();
+//                    JSONObject json = new JSONObject();
-                    json.put("task_code", task_code);
+//                    json.put("task_code", task_code);
-                    json.put("ext_task_id", ext_task_id);
+//                    json.put("ext_task_id", ext_task_id);
-                    json.put("msg", "存在相同的任务号:" + task_code);
+//                    json.put("msg", "存在相同的任务号:" + task_code);
-                    errArr.add(json);
+//                    errArr.add(json);
                     continue;
                 }
 //                if (!StrUtil.isEmpty(vehicle_code)) {

nladmin-system/nlsso-server/src/main/java/org/nl/acs/hand/service/impl/HandServicelmpl.java

@@ -333,6 +333,11 @@ public class HandServicelmpl implements HandService {
         region.put("region_code", "27");
         region.put("region_name", "一号楼一楼产线");
         regions.add(region);
+        region = new HashMap<>();
+        region.put("region_id", "28");
+        region.put("region_code", "28");
+        region.put("region_name", "五号楼二楼产线");
+        regions.add(region);
         jo.put("code", "1");
         jo.put("desc", "查询成功");
         jo.put("result", regions);

nladmin-ui/src/layout/components/Sidebar/Logo.vue

@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import Logo from '@/assets/images/newloge.png'
+import Logo from '@/assets/images/newlogo.png'
 import variables from '@/assets/styles/variables.scss'
 export default {
   name: 'SidebarLogo',

nladmin-ui/src/views/acs/route/routeLine/index.vue

@@ -178,12 +178,12 @@
         />
         <el-table-column prop="start_device_type" min-width="120" :label="$t('route.table_title.device_type')" />
         <el-table-column v-if="false" prop="device_code" :label="$t('device.device_table_title.device_name')" />
-        <el-table-column prop="type" :label="$t('route.table_title.type')">
+<!--        <el-table-column prop="type" :label="$t('route.table_title.type')">-->
-          <template slot-scope="scope">
+<!--          <template slot-scope="scope">-->
-            <span v-if="scope.row.type=='0' ">{{ $t('route.table_title.transport_route') }}</span>
+<!--            <span v-if="scope.row.type=='0' ">{{ $t('route.table_title.transport_route') }}</span>-->
-            <span v-if="scope.row.type=='1' ">{{ $t('route.table_title.agv_route') }}</span>
+<!--            <span v-if="scope.row.type=='1' ">{{ $t('route.table_title.agv_route') }}</span>-->
-          </template>
+<!--          </template>-->
-        </el-table-column>
+<!--        </el-table-column>-->
         <el-table-column prop="next_device_code" min-width="120" :label="$t('route.table_title.next_device_code')" />
         <el-table-column v-if="false" prop="next_device_code" min-width="120" label="后置设备名称" />
         <el-table-column prop="next_device_type" min-width="120" :label="$t('route.table_title.next_device_type')" />