add 大屏真实数据

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java

@@ -144,6 +144,9 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
                 this.setRequireSucess(false);
                 logServer.deviceItemValue(this.device_code, "mode", String.valueOf(mode));
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + " -> " + mode);
+                if ("true".equals(this.getExtraValue().get("ignore_release_check"))) {
+                    acsToWmsService.deactivatePoint(this.device_code, mode != 0);
+                }
             }
             if (move != last_move) {
                 logServer.deviceItemValue(this.device_code, "move", String.valueOf(move));

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

@@ -184,4 +184,6 @@ public interface AcsToWmsService {
     HttpResponse fjNeed(JSONObject param);
 
     void equipmentFailure(String deviceCode);
+
+    void deactivatePoint(String deviceCode, boolean isUsed);
 }

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

@@ -1183,4 +1183,31 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
             MDC.remove(log_file_type);
         }
     }
+
+    @Override
+    public void deactivatePoint(String deviceCode, boolean isUsed) {
+        try {
+            MDC.put(log_file_type, log_type);
+            String wmsurl = acsConfigService.findByCode(AcsConfig.WMSURL).getValue();
+
+            JSONObject param = new JSONObject();
+            param.put("device_code", deviceCode);
+            param.put("is_used", isUsed);
+            log.info("deactivatePoint - 请求参数 {}", param);
+            AddressDto addressDto = addressService.findByCode("deactivatePoint");
+            String methods_url = addressDto.getMethods_url();
+            try {
+                HttpResponse response = HttpRequest
+                        .post(wmsurl + methods_url)
+                        .timeout(2000)
+                        .body(param.toJSONString())
+                        .execute();
+                log.info("deactivatePoint - 响应参数 {}", response.body());
+            } catch (Exception e) {
+                log.error("deactivatePoint - 请求错误！", e);
+            }
+        } finally {
+            MDC.remove(log_file_type);
+        }
+    }
 }

lms/nladmin-system/src/main/java/org/nl/wms/dashboard/wql/DASHBOARD.wql

@@ -61,13 +61,17 @@
             	d.region_code,
             	wod.qty,
             	wod.weight,
-            	wo.plan_qty
+            	wo.plan_qty,
+            	wo.plan_weight,
+                mb.material_name,
+                d.device_name
             FROM
-            	pdm_bd_work_order_daliy wod
+            	pdm_bd_work_order_daily wod
             	LEFT JOIN pdm_bd_workorder wo ON wod.workorder_id = wo.workorder_id
             	LEFT JOIN pdm_bi_device d ON wo.device_id = d.device_id
+            	LEFT JOIN md_me_materialbase mb ON wo.material_id = mb.material_id
             WHERE
-            	TO_DAYS ( wod.date ) = TO_DAYS ( NOW() )
+            	TO_DAYS(wod.date) = TO_DAYS(NOW())
             ENDSELECT
         ENDQUERY
     ENDIF
@@ -91,7 +95,8 @@
             	mb.material_name,
             	d.device_name,
             	vd.in_kiln_time,
-                vd.out_kiln_time
+                vd.out_kiln_time,
+                p.update_time
             FROM
             	sch_base_point p
             	LEFT JOIN st_ivt_vehicle_detail vd ON p.vd_id = vd.vd_id
@@ -140,6 +145,8 @@
         QUERY
             SELECT
             	vd.qty,
+            	vd.weight,
+            	mb.material_id,
             	mb.material_name,
             	wo.kh,
             	wo.device_code
@@ -154,3 +161,77 @@
             ENDSELECT
         ENDQUERY
     ENDIF
+
+    IF 输入.flag = "7"
+        QUERY
+            SELECT
+            	d.device_name,
+                d.region_code,
+            	mb.material_number,
+            	mb.material_name,
+            	SUM(wod.qty) AS qty,
+            	SUM(wod.weight) AS weight
+            FROM
+            	pdm_bd_work_order_daily wod
+            	LEFT JOIN pdm_bd_workorder wo ON wod.workorder_id = wo.workorder_id
+            	LEFT JOIN pdm_bi_device d ON wo.device_id = d.device_id
+            	LEFT JOIN md_me_materialbase mb ON wo.material_id = mb.material_id
+            WHERE
+            	TO_DAYS(wod.date) = TO_DAYS(NOW())
+            GROUP BY
+            	d.device_id, mb.material_id
+            ENDSELECT
+        ENDQUERY
+    ENDIF
+
+    IF 输入.flag = "8"
+        QUERY
+            SELECT
+            	mb.material_name,
+            	SUM( wo.plan_qty ) AS plan_qty,
+            	SUM( wod.qty ) AS qty
+            FROM
+            	pdm_bd_workorder wo
+            	LEFT JOIN pdm_bd_work_order_daily wod ON wo.workorder_id = wod.workorder_id
+            	LEFT JOIN pdm_bi_device d ON wo.device_id = d.device_id
+            	LEFT JOIN md_me_materialbase mb ON wo.material_id = mb.material_id
+            WHERE
+            	wo.is_delete = '0'
+            	AND d.region_code = 'FJ'
+            	AND wo.order_status <> '5'
+            GROUP BY
+            	mb.material_id
+            ENDSELECT
+        ENDQUERY
+    ENDIF
+
+    IF 输入.flag = "9"
+        QEURY
+            SELECT
+            	wo.workorder_code,
+            	d.device_name,
+            	mb.material_number,
+            	mb.material_name,
+            	wo.kh,
+            	wo.plan_qty,
+            	wo.plan_weight,
+            	ANY_VALUE(dd.label) AS `status`,
+            	wo.realproducestart_date,
+            	wo.realproduceend_date,
+            	SUM(wod.qty) AS qty,
+            	SUM(wod.weight) AS weight,
+            	d.region_code
+            FROM
+            	pdm_bd_workorder wo
+            	LEFT JOIN pdm_bi_device d ON wo.device_id = d.device_id
+            	LEFT JOIN md_me_materialbase mb ON wo.material_id = mb.material_id
+            	LEFT JOIN sys_dict_detail dd ON wo.order_status = dd.`value` AND dd.`name` = 'pdm_workorder_status'
+            	LEFT JOIN pdm_bd_work_order_daily wod ON wo.workorder_id = wod.workorder_id
+            WHERE
+            	wo.is_delete = '0'
+            	AND DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= DATE(wo.create_time)
+            GROUP BY
+            	wo.workorder_id
+            ENDSELECT
+        ENDQUERY
+    ENDIF

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

@@ -229,4 +229,12 @@ public class AcsToWmsController {
     public void equipmentFailure(@RequestBody JSONObject param) {
         acsToWmsService.equipmentFailure(param);
     }
+
+    @PostMapping("/deactivatePoint")
+    @Log("禁用或启用点位")
+    @ApiOperation("禁用或启用点位")
+    @SaIgnore
+    public void deactivatePoint(@RequestBody JSONObject param) {
+        acsToWmsService.deactivatePoint(param);
+    }
 }

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

@@ -118,4 +118,6 @@ public interface AcsToWmsService {
     JSONObject fjNeed(JSONObject param);
 
     void equipmentFailure(JSONObject param);
+
+    void deactivatePoint(JSONObject param);
 }

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

@@ -1276,4 +1276,15 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
             WQLObject.getWQLObject("das_device_number").insert(dn);
         }
     }
+
+    @Override
+    public void deactivatePoint(JSONObject param) {
+        String pointCode = param.getString("device_code");
+        if (StrUtil.isNotBlank(pointCode)) {
+            JSONObject update = new JSONObject();
+            update.put("is_used", param.getBooleanValue("is_used") ? TrueOrFalse.TRUE.value() : TrueOrFalse.FALSE.value());
+            TaskUtils.addACSUpdateColum(update);
+            WQLObject.getWQLObject("sch_base_point").update(update, "point_code = '" + pointCode + "'");
+        }
+    }
 }

lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoUpdateWorkOrder.java

@@ -72,7 +72,7 @@ public class AutoUpdateWorkOrder {
                                     wod.put("qty", datum.getIntValue("qty") + wod.getIntValue("qty"));
                                     wod.put("qualified_qty", datum.getIntValue("qualified_qty") + wod.getIntValue("qualified_qty"));
                                     wod.put("unqualified_qty", datum.getIntValue("unqualified_qty") + wod.getIntValue("unqualified_qty"));
-                                    wod.put("weight", datum.getDoubleValue("weight") + wod.getIntValue("weight"));
+                                    wod.put("weight", datum.getDoubleValue("weight") + wod.getDoubleValue("weight"));
                                     wod.put("avg_piece_weight", datum.getDoubleValue("avg_piece_weight") / 1000);
                                     TaskUtils.addAutoUpdateColum(wod);
                                     wodTable.update(wod);

lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/YZCallMaterialTask.java

@@ -89,11 +89,10 @@ public class YZCallMaterialTask extends AbstractAcsTask {
             task.put("group_id", point1.getString("vd_id"));
             task.put("remark", "");
 
-            JSONObject point_update = new JSONObject();
+            point1.put("lock_type", LockType.TASK_LOCKED.value());
-            point_update.put("lock_type", LockType.TASK_LOCKED.value());
+            point1.put("task_code", task.getString("task_code"));
-            point_update.put("task_code", task.getString("task_code"));
+            TaskUtils.addFormUpdateColum(point1, form);
-            TaskUtils.addFormUpdateColum(point_update, form);
+            point_table.update(point1);
-            point_table.update(point_update, "point_id = " + point1.getLongValue("point_id"));
 
             WQLObject.getWQLObject("sch_base_task").insert(task);
 
@@ -106,19 +105,6 @@ public class YZCallMaterialTask extends AbstractAcsTask {
 
     @Override
     public void findStartPoint() {
-        WQLObject task_table = WQLObject.getWQLObject("sch_base_task");
-        JSONArray tasks = task_table
-                .query("is_delete = '0' AND task_status = '" + TaskStatus.SURE_END.value() + "' AND handle_class = '" + YZCallMaterialTask.class.getName() + "'", "priority DESC, create_time ASC")
-                .getResultJSONArray(0);
-        if (ObjectUtil.isNotEmpty(tasks)) {
-            WQLObject point_table = WQLObject.getWQLObject("sch_base_point");
-
-            for (int i = 0; i < tasks.size(); i++) {
-                JSONObject task = tasks.getJSONObject(i);
-
-
-            }
-        }
     }
 
 

lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/YZSendMaterialTask.java

@@ -85,11 +85,21 @@ public class YZSendMaterialTask extends AbstractAcsTask {
             for (int i = 0; i < tasks.size(); i++) {
                 JSONObject task = tasks.getJSONObject(i);
 
-                JSONObject point = WQL
+                JSONObject point = null;
-                        .getWO("SEND_MATERIAL_TASK")
+                if (100 == task.getIntValue("priority")) {
-                        .addParam("flag", "1")
+                    point = WQL
-                        .process()
+                            .getWO("SEND_MATERIAL_TASK")
-                        .uniqueResult(0);
+                            .addParam("flag", "7")
+                            .process()
+                            .uniqueResult(0);
+                }
+                if (ObjectUtil.isEmpty(point)) {
+                    point = WQL
+                            .getWO("SEND_MATERIAL_TASK")
+                            .addParam("flag", "1")
+                            .process()
+                            .uniqueResult(0);
+                }
 
                 if (ObjectUtil.isNotEmpty(point)) {
                     task.put("task_status", TaskStatus.START_AND_END.value());

lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/wql/SEND_MATERIAL_TASK.wql

@@ -143,3 +143,19 @@
             ENDSELECT
         ENDQUERY
     ENDIF
+
+    IF 输入.flag = "7"
+        QUERY
+            SELECT
+                *
+            FROM
+                sch_base_point
+            WHERE
+                is_used = '1'
+                AND lock_type = '1'
+                AND point_status = '1'
+                AND region_code = 'GZ'
+                AND point_type = '1'
+            ENDSELECT
+        ENDQUERY
+    ENDIF

lms/nladmin-system/src/main/resources/config/application.yml

@@ -2,7 +2,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: dev
+    active: prod
   jackson:
     time-zone: GMT+8
   data: