下发RGV托盘类型更新

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java

@@ -29,6 +29,7 @@ import org.nl.wql.core.bean.WQLObject;
 import org.openscada.opc.lib.da.Server;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.lang.reflect.Field;
 import java.util.*;
 import java.util.HashMap;
 import java.util.List;
@@ -655,6 +656,23 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
         ReadUtil.write(itemMap, server);
     }
 
+    public static Boolean isExistFieldName(String fieldName, Object obj) throws NoSuchFieldException {
+        if (obj == null || StrUtil.isEmpty(fieldName)) {
+            return null;
+        }
+        //获取这个类的所有属性
+        Field[] fields = obj.getClass().getDeclaredFields();
+        boolean flag = false;
+        //循环遍历所有的fields
+        for (int i = 0; i < fields.length; i++) {
+            if (fields[i].getName().equals("item_" + fieldName)) {
+                flag = true;
+                break;
+            }
+        }
+        return flag;
+    }
+
     @Override
     public JSONObject getDeviceStatusName() {
         JSONObject jo = new JSONObject();

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

@@ -495,6 +495,8 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
                 LnshSplitManipulatorDeviceDriver lnshSplitManipulatorDeviceDriver;
                 //拆码垛机械手
                 RljnPackagePalletSplitManipulatorDeviceDriver rljnPackagePalletSplitManipulatorDeviceDriver;
+                //双工位RGV
+                LnshRGVDeviceDriver lnshRGVDeviceDriver;
 
                 //晟华覆膜机
                 if (device.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) {
@@ -523,6 +525,15 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
                     }
                     rljnPackagePalletSplitManipulatorDeviceDriver.writing(code, value);
                 }
+
+                if (device.getDeviceDriver() instanceof LnshRGVDeviceDriver) {
+                    lnshRGVDeviceDriver = (LnshRGVDeviceDriver) device.getDeviceDriver();
+                    org.nl.acs.device_driver.lnsh.lnsh_rgv.ItemProtocol itemProtocol = new org.nl.acs.device_driver.lnsh.lnsh_rgv.ItemProtocol(lnshRGVDeviceDriver);
+                    if (!lnshRGVDeviceDriver.isExistFieldName(code, itemProtocol)) {
+                        throw new Exception("设备:" + device_code + "未找到对应信号:" + code);
+                    }
+                    lnshRGVDeviceDriver.writing(code, value);
+                }
             }
             JSONObject resultJson = new JSONObject();
             resultJson.put("status", HttpStatus.OK);

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

@@ -87,7 +87,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                     fmjToPackIngTask.createTask((JSONObject) JSON.toJSON(jsonObject));
                     //生成到包装位的任务时，下发托盘类型给RGV
                     String point_id = pointTable.query("point_code ='" + device_code + "'").uniqueResult(0).getString("point_id");
-                    String material_id = structivtTable.query("point_id ='" + point_id + "'").uniqueResult(0).getString("material_id");
+                    String material_id = structivtTable.query("struct_id ='" + point_id + "'").uniqueResult(0).getString("material_id");
                     JSONObject materiralObj1 = WQLObject.getWQLObject("md_me_material").query("material_id = '" + material_id + "'").uniqueResult(0);
                     //寻找对应的托盘类型
                     String vehicle_type = vehicleService.getVehicleType(materiralObj1.getString("vehicle_type"));

wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java

@@ -139,7 +139,7 @@ public class ProducetaskServiceImpl implements ProducetaskService {
         //根据物料去找木托盘类型
         JSONObject materialObj = WQLObject.getWQLObject("md_me_material").query("material_id = '" + material_id + "'").uniqueResult(0);
         String vehicle_type = materialObj.getString("vehicle_type");
-        if (StrUtil.isEmpty(vehicle_type)) {
+        if (StrUtil.isEmpty(vehicle_type) || StrUtil.equals(vehicle_type,"0")) {
             throw new RuntimeException("木托盘类型不可为空！");
         }
         dto.setVehicle_type(vehicle_type);

wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/FmjToPackIngTask.java

@@ -131,7 +131,7 @@ public class FmjToPackIngTask extends AbstractAcsTask {
         String next_point_code = "BZSLW";
         String material_id = ivtObj.getString("material_id");
         String is_full = ivtObj.getString("is_full");
-        String qty = ivtObj.getString("qty");
+        String qty = ivtObj.getString("canuse_qty");
         String pcsn = ivtObj.getString("pcsn");
         String vehicle_code = ivtObj.getString("vehicle_code");
         WQLObject taskTable = WQLObject.getWQLObject("SCH_BASE_Task");