From f86be4543c65e99af05347e61fd7062e0abfae2c Mon Sep 17 00:00:00 2001
From: psh <psh>
Date: Wed, 3 Apr 2024 17:28:38 +0800
Subject: [PATCH] fix

---
 .../basedriver/ssx_site/ItemProtocol.java       |  5 -----
 .../ssx_site/SsxSiteDeviceDriver.java           |  4 ----
 .../sch/task_manage/task/tasks/POINTTask.java   | 17 +----------------
 3 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/ssx_site/ItemProtocol.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/ssx_site/ItemProtocol.java
index 9d9133e..4871953 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/ssx_site/ItemProtocol.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/ssx_site/ItemProtocol.java
@@ -18,7 +18,6 @@ public class ItemProtocol {
     public static String item_error = "error";
     public static String item_task = "task";
     public static String item_weight = "weight";
-    public static String item_material_type = "material_type";
     public static String item_sub_tray = "sub_tray";
     public static String item_mother_tray = "mother_tray";
     public static String item_to_command = "to_command";
@@ -57,9 +56,6 @@ public class ItemProtocol {
     public int getWeight() {
         return this.getOpcIntegerValue(item_weight);
     }
-    public int getMaterialType() {
-        return this.getOpcIntegerValue(item_material_type);
-    }
     public int getSubTray() {
         return this.getOpcIntegerValue(item_sub_tray);
     }
@@ -109,7 +105,6 @@ public class ItemProtocol {
         list.add(new ItemDto(item_action, "取放信号", "DB600.B3"));
         list.add(new ItemDto(item_task, "任务号", "DB600.D4"));
         list.add(new ItemDto(item_weight, "重量", "DB600.D4"));
-        list.add(new ItemDto(item_material_type, "物料类型", "DB600.D4"));
         list.add(new ItemDto(item_sub_tray, "子托盘条码", "DB600.D4"));
         list.add(new ItemDto(item_mother_tray, "母托盘条码", "DB600.D4"));
         list.add(new ItemDto(item_error, "报警信号", "DB600.B5"));
diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/ssx_site/SsxSiteDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/ssx_site/SsxSiteDeviceDriver.java
index ae4ce53..e10dc46 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/ssx_site/SsxSiteDeviceDriver.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/ssx_site/SsxSiteDeviceDriver.java
@@ -79,8 +79,6 @@ public class SsxSiteDeviceDriver extends AbstractOpcDeviceDriver implements Devi
     int last_io_action = 0;
     double weight = 0;
     double last_weight = 0;
-    int material_type = 0;
-    int last_material_type =0;
     int sub_tray = 0;
     int last_sub_tray =0;
     int mother_tray = 0;
@@ -149,7 +147,6 @@ public class SsxSiteDeviceDriver extends AbstractOpcDeviceDriver implements Devi
             hasGoods = this.itemProtocol.getMove();
             action = this.itemProtocol.getAction();
             weight = this.itemProtocol.getWeight();
-            material_type = this.itemProtocol.getMaterialType();
             mother_tray = this.itemProtocol.getMotherTray();
             sub_tray = this.itemProtocol.getSubTray();
             if (mode != last_mode) {
@@ -222,7 +219,6 @@ public class SsxSiteDeviceDriver extends AbstractOpcDeviceDriver implements Devi
         last_move = move;
         last_task = task;
         last_weight = weight;
-        last_material_type = material_type;
         last_sub_tray = sub_tray;
         last_mother_tray = mother_tray;
         last_action = action;
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/POINTTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/POINTTask.java
index 45365f1..db245b8 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/POINTTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/POINTTask.java
@@ -206,21 +206,6 @@ public class POINTTask extends AbstractTask {
 
     @Override
     protected void feedbackTaskState(JSONObject param,SchBaseTask schBaseTask, BaseResponse result) {
-        //重算最优点
-        JSONObject jsonObject = JSONObject.parseObject(schBaseTask.getExt_group_data());
-        SchBasePoint point = this.findNextPoint(jsonObject,schBaseTask);
-        //正极板现在不堆叠
-        if( "1".equals(jsonObject.getString("material_type"))) {
-            schBaseTask.setPoint_code1(point.getPoint_code()+"0"+(point.getVehicle_qty()));
-        }else{
-            schBaseTask.setPoint_code1(point.getPoint_code().replace("HCQ","QHQ"));
-        }
-        //重算点位时把点位占用
-            point.setIng_task_code(schBaseTask.getTask_code());
-        //如果是正极板对接位则直接减库存
-        if ((point.getPoint_code().startsWith("ZJBDJW"))) {
-            point.setVehicle_qty(point.getVehicle_qty() - 1);
-        }
-        pointService.update(point);
+        //该场景无需重算等待点
     }
 }