跳过困料暂存区 后端数据校验

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java

@@ -317,13 +317,13 @@ public class HfStationDeviceDriver extends AbstractOpcDeviceDriver implements De
                     break;
                 case 6:
                     //呼叫空盅
-                    if (!callEmptyRequireSucess && StrUtil.isNotEmpty(order)) {
+                    if (!callEmptyRequireSucess && move == 0) {
                         callEmpty();
                     }
                     break;
                 case 7:
                     //满盅入库
-                    if (!fullInRequireSucess && StrUtil.isNotEmpty(order)) {
+                    if (!fullInRequireSucess && move != 0) {
                         fullIn();
                     }
                     break;

acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/WmsToAcsController.java

@@ -69,6 +69,14 @@ public class WmsToAcsController {
         return new ResponseEntity<>(wmstoacsService.forceFinishFromWms(whereJson), HttpStatus.OK);
     }
 
+    @PostMapping("/queryGT04Status")
+    @Log("查询GT04状态")
+    @ApiOperation("查询GT04状态")
+    @SaIgnore
+    public ResponseEntity<Object> queryGT04Status() throws Exception {
+        return new ResponseEntity<>(wmstoacsService.queryGT04Status(), HttpStatus.OK);
+    }
+
 
 
 }

acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/WmsToAcsService.java

@@ -41,5 +41,5 @@ public interface WmsToAcsService {
     Map<String, Object> forceFinishFromWms(String jsonObject) throws Exception;
 
 
-
+    Map<String, Object> queryGT04Status();
 }

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

@@ -363,4 +363,11 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
         return resultJson;
     }
 
+    @Override
+    public Map<String, Object> queryGT04Status() {
+        HfStationDeviceDriver gt04 = (HfStationDeviceDriver) deviceAppService.findDeviceByCode("GT04").getDeviceDriver();
+        JSONObject result = new JSONObject();
+        result.put("GT04", gt04.getMode() != 0 && gt04.getMove() == 0);
+        return result;
+    }
 }