From 15abb168680036797131452259bcdce1d894219b Mon Sep 17 00:00:00 2001 From: 18188916393 <2562295436@qq.com> Date: Fri, 26 Aug 2022 16:27:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=BB=AD=E9=97=AE=E9=A2=98=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/wms/common/PressureUtil.java | 3 +- .../org/nl/wms/common/StructFindUtil.java | 4 + .../wms/ext/acs/rest/AcsToWmsController.java | 4 +- .../wms/ext/acs/service/AcsToWmsService.java | 4 +- .../acs/service/impl/AcsToWmsServiceImpl.java | 63 ++++--- .../pda/checkout/rest/CheckOutController.java | 4 +- .../wms/pda/sendMaterial/wql/QPADSERVICE.wql | 15 ++ .../rest/VehicleStatusController.java | 47 +++++ .../service/VehicleStatusService.java | 16 ++ .../impl/VehicleStatusServiceImpl.java | 74 ++++++++ .../wms/sch/manage/buss/CallMaterialTask.java | 2 - .../sch/task/AutoSynchronDeviceStausTask.java | 34 ++-- .../src/main/java/org/nl/wms/wms.xls | Bin 396800 -> 397312 bytes .../main/resources/config/application-dev.yml | 2 +- .../resources/config/application-test.yml | 164 ------------------ .../main/resources/config/businessTpye.txt | 9 - .../src/main/resources/log/AcsToErp.xml | 32 ---- .../src/main/resources/log/AcsToWms.xml | 32 ---- .../src/main/resources/log/AgvServiceImpl.xml | 32 ---- .../src/main/resources/log/AgvackServlet.xml | 32 ---- .../src/main/resources/log/AutoCreateInst.xml | 31 ---- .../log/NDCSocketConnectionAutoRun.xml | 32 ---- .../main/resources/log/QueryAgvTaskStatus.xml | 32 ---- .../resources/log/QueryXZAgvTaskStatus.xml | 32 ---- .../src/main/resources/log/WmsToAcs.xml | 32 ---- 25 files changed, 231 insertions(+), 501 deletions(-) create mode 100644 wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/vehicleStatus/rest/VehicleStatusController.java create mode 100644 wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/vehicleStatus/service/VehicleStatusService.java create mode 100644 wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/vehicleStatus/service/impl/VehicleStatusServiceImpl.java delete mode 100644 wms/hd/nladmin-system/src/main/resources/config/application-test.yml delete mode 100644 wms/hd/nladmin-system/src/main/resources/config/businessTpye.txt delete mode 100644 wms/hd/nladmin-system/src/main/resources/log/AcsToErp.xml delete mode 100644 wms/hd/nladmin-system/src/main/resources/log/AcsToWms.xml delete mode 100644 wms/hd/nladmin-system/src/main/resources/log/AgvServiceImpl.xml delete mode 100644 wms/hd/nladmin-system/src/main/resources/log/AgvackServlet.xml delete mode 100644 wms/hd/nladmin-system/src/main/resources/log/AutoCreateInst.xml delete mode 100644 wms/hd/nladmin-system/src/main/resources/log/NDCSocketConnectionAutoRun.xml delete mode 100644 wms/hd/nladmin-system/src/main/resources/log/QueryAgvTaskStatus.xml delete mode 100644 wms/hd/nladmin-system/src/main/resources/log/QueryXZAgvTaskStatus.xml delete mode 100644 wms/hd/nladmin-system/src/main/resources/log/WmsToAcs.xml diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/PressureUtil.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/PressureUtil.java index 2fa6466..ce97817 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/PressureUtil.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/PressureUtil.java @@ -18,8 +18,9 @@ public class PressureUtil { int qty = (int) whereJson.get("qty"); String record_id = ""; //根据设备查询当前设备以及排产单号 - JSONObject joo = WQL.getWO("QSTRUCT_RULE").addParam("flag", "1").addParam("point_code", device_code).process().uniqueResult(0); + JSONObject joo = WQL.getWO("QSTRUCT_RULE").addParam("flag", "12").addParam("point_code", device_code).process().uniqueResult(0); String producetask_id = joo.getString("producetask_id"); + String device_id = joo.getString("device_id"); if (StrUtil.isEmpty(producetask_id)) { throw new BadRequestException("为找到生产任务！"); } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java index 666819b..afcb86f 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java @@ -53,6 +53,10 @@ public class StructFindUtil { if (StrUtil.isEmpty(workprocedure_id)) { throw new BadRequestException("工序不能为空！"); } + //is_full 传过来的参数如果是2 ，则代表半托，满托都可以出 + if (StrUtil.equals(is_full, "2")) { + is_full = ""; + } JSONObject result = WQL.getWO("QSTRUCT_RULE").addParam("flag", "3") .addParam("material_id", material_id).addParam("area_type", area_type) .addParam("is_full", is_full).addParam("workprocedure_id", workprocedure_id) diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java index b0eb7c5..347426d 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java @@ -114,8 +114,8 @@ public class AcsToWmsController { @PostMapping("/agv") @Log("ACS给WMS反馈任务状态") @ApiOperation("ACS给WMS反馈任务状态") - public ResponseEntity receiveAgvStatus(@RequestBody Map whereJson ) { - return new ResponseEntity<>(acsToWmsService.receiveAgvStatus( whereJson), HttpStatus.OK); + public ResponseEntity receiveAgvStatus(@RequestBody JSONArray arr ) { + return new ResponseEntity<>(acsToWmsService.receiveAgvStatus( arr), HttpStatus.OK); } @PostMapping("/queryCribbingInfo") diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java index 5f7d47c..e87cf07 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java @@ -1,5 +1,7 @@ package org.nl.wms.ext.acs.service; +import com.alibaba.fastjson.JSONArray; + import java.util.Map; public interface AcsToWmsService { @@ -108,7 +110,7 @@ public interface AcsToWmsService { * @param string 条件 物料条码 * @return Map */ - Map receiveAgvStatus(Map jsonObject); + Map receiveAgvStatus(JSONArray arr); /** * 获取垛形参数 * @return Map diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index f92a664..01677a5 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -142,26 +142,30 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { sendMaterialTask.createTask((JSONObject) JSON.toJSON(jsonObject)); //假如是压制下料的几个位置 需要记录不合格数量 if (StrUtil.equals(area_type, AreaEnum.YZQY.getCode())) { - /* JSONObject joo = new JSONObject(); - joo.put("qty", "qty"); + JSONObject joo = new JSONObject(); + joo.put("qty", jsonObject.get("unqualified_qty")); joo.put("device_code", device_code); - joo.put("reason", "reason"); String record_id = PressureUtil.record(joo); //回传不合格记录 WmsToJnServiceImpl wmsToJnService = new WmsToJnServiceImpl(); - wmsToJnService.feedBackQualityInfo(record_id);*/ + wmsToJnService.feedBackQualityInfo(record_id); } break; case "2": //叫料出库 jsonObject.put("next_point_code", device_code); jsonObject.put("create_mode", "01"); + //机械手1 is_full给1 ，机械手3is_full给空，半托，跟满托都可以出 + if(StrUtil.equals(device_code,"FJJXSSLW101")||StrUtil.equals(device_code,"FJJXSSLW102")){ + is_full ="1"; + } + if (StrUtil.equals(device_code,"FJJXSSLW301")||StrUtil.equals(device_code,"FJJXSSLW302")){ + is_full ="2"; + } jsonObject.put("is_full", is_full); produceInfoByCode = this.getProduceInfoByCode(device_code); //批次 物料，客户要从排产单里面去取 - jsonObject.put("pcsn", "pcsn"); - jsonObject.put("material_id", "1515940603542769664"); - jsonObject.put("cust_id", "1516368197694132224"); + jsonObject.put("material_id", produceInfoByCode.getString("material_id")); callMaterialTask.createTask((JSONObject) JSON.toJSON(jsonObject)); break; @@ -261,6 +265,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { throw new BadRequestException("设备点位不能为空！"); } JSONObject produceInfoByCode = new JSONObject(); + String is_full = (String)jsonObject.get("is_full"); String vehicle_code = (String) jsonObject.get("vehicle_code"); String qty = String.valueOf(jsonObject.get("qty")); //String material_code = (String) jsonObject.get("material_code"); @@ -340,6 +345,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { groubObj.put("create_id", SecurityUtils.getCurrentUserId()); groubObj.put("create_name", SecurityUtils.getNickName()); groubObj.put("create_time", DateUtil.now()); + groubObj.put("is_full", is_full); //去自动码垛还是人工码垛从物料信息里面去取 groubObj.put("is_autopackage", materialObj.getString("is_auto_package")); //假如是分拣机械手，并且托盘为空，则托盘从点位上取 @@ -712,14 +718,35 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } @Override - public Map receiveAgvStatus(Map jsonObject) { + public Map receiveAgvStatus(JSONArray arr) { WQLObject deviceStatus_table = WQLObject.getWQLObject("st_buss_deviceStatus"); - String agv_no = (String) jsonObject.get("agv_no"); - String status = (String) jsonObject.get("status"); - JSONObject statsObj = deviceStatus_table.query("device_type ='1' and device_code ='" + agv_no + "'").uniqueResult(0); - statsObj.put("device_status", status); - statsObj.put("update_time", DateUtil.now()); - deviceStatus_table.update(statsObj); + for (int i = 0; i < arr.size(); i++) { + JSONObject jo = arr.getJSONObject(i); + String agv_no = jo.getString("device_code"); + String status = jo.getString("status"); + String device_status = ""; + // 1-搬运中 2-充电 3-等待 4-故障 5-停用 + if (StrUtil.equals(status, "EXECUTING")) { + device_status = "1"; + } + if (StrUtil.equals(status, "CHARGING")) { + device_status = "2"; + } + if (StrUtil.equals(status, "IDLE")) { + device_status = "3"; + } + if (StrUtil.equals(status, "ERROR")) { + device_status = "4"; + } + if (StrUtil.equals(status, "UNKNOWN") || StrUtil.equals("UNAVAILABLE", status)) { + device_status = "5"; + } + JSONObject statsObj = deviceStatus_table.query("device_type ='1' and device_code ='" + agv_no + "'").uniqueResult(0); + statsObj.put("device_status", device_status); + statsObj.put("update_time", DateUtil.now()); + deviceStatus_table.update(statsObj); + } + JSONObject result = new JSONObject(); result.put("status", HttpStatus.OK.value()); result.put("message", "任务状态反馈成功!"); @@ -746,15 +773,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { //从组盘表里面去获取 result = group_table.query("vehicle_code = '" + vehicle_code + "'").uniqueResult(0); } - JSONObject returnjo = new JSONObject(); - returnjo.put("status", HttpStatus.OK.value()); - returnjo.put("message", "任务状态反馈成功!"); - returnjo.put("data", result); - return returnjo; + return result; } - private JSONObject getProduceInfoByCode(String code) { + public static JSONObject getProduceInfoByCode(String code) { //根据 设备点位去找生产任务信息 //1 根据点位去找设备，去找对应的设备信息 JSONObject pointObj = WQLObject.getWQLObject("sch_base_point").query("point_code ='" + code + "'").uniqueResult(0); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/checkout/rest/CheckOutController.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/checkout/rest/CheckOutController.java index cc0a6f7..f87c30a 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/checkout/rest/CheckOutController.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/checkout/rest/CheckOutController.java @@ -24,8 +24,8 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "手持托盘入窑贵州") -@RequestMapping("/api/pda/ruleSetting") +@Api(tags = "手持人工出库") +@RequestMapping("/api/pda/outStruct") @Slf4j public class CheckOutController { diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendMaterial/wql/QPADSERVICE.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendMaterial/wql/QPADSERVICE.wql index 4629269..c28cbdc 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendMaterial/wql/QPADSERVICE.wql +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendMaterial/wql/QPADSERVICE.wql @@ -433,3 +433,18 @@ IF 输入.flag = "17" ENDQUERY ENDIF +IF 输入.flag = "18" + QUERY + SELECT + vehiclegroup.is_full, + vehiclegroup.vehicle_code + FROM + st_buss_vehiclegroup vehiclegroup + WHERE + 1 =1 + OPTION 输入.vehicle_code <> "" + st_buss_vehiclegroup.vehicle_code = 输入.vehicle_code + ENDOPTION + ENDSELECT + ENDQUERY + ENDIF diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/vehicleStatus/rest/VehicleStatusController.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/vehicleStatus/rest/VehicleStatusController.java new file mode 100644 index 0000000..b29f3a7 --- /dev/null +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/vehicleStatus/rest/VehicleStatusController.java @@ -0,0 +1,47 @@ + +package org.nl.wms.pda.vehicleStatus.rest; + + +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.annotation.Log; +import org.nl.wms.pda.vehicleStatus.service.VehicleStatusService; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Map; + +/** + * @author ldjun + * @date 2021-07-26 + **/ +@RestController +@RequiredArgsConstructor +@Api(tags = "手") +@RequestMapping("/api/pda/vehicleStatus") +@Slf4j +public class VehicleStatusController { + + private final VehicleStatusService vehicleStatusService; + + @PostMapping("/queryInfoBycode") + @Log("根据托盘号查询是否满托") + @ApiOperation("根据托盘号查询是否满托") + public ResponseEntity queryInfoBycode(@RequestBody Map param) { + return new ResponseEntity<>(vehicleStatusService.queryInfoBycode(param), HttpStatus.OK); + } + @PostMapping("/confirm") + @Log("状态修改确定") + @ApiOperation("状态修改确定") + public ResponseEntity Confirm(@RequestBody JSONObject param) { + return new ResponseEntity<>(vehicleStatusService.Confirm(param), HttpStatus.OK); + } + +} diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/vehicleStatus/service/VehicleStatusService.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/vehicleStatus/service/VehicleStatusService.java new file mode 100644 index 0000000..ffdc30c --- /dev/null +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/vehicleStatus/service/VehicleStatusService.java @@ -0,0 +1,16 @@ +package org.nl.wms.pda.vehicleStatus.service; + +import com.alibaba.fastjson.JSONObject; + +import java.util.Map; + +public interface VehicleStatusService { + Map queryInfoBycode(Map jsonObject); + /** + * 盘点单确认 + * @param param 条件 + * @return Map + * + */ + Map Confirm( JSONObject param); +} diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/vehicleStatus/service/impl/VehicleStatusServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/vehicleStatus/service/impl/VehicleStatusServiceImpl.java new file mode 100644 index 0000000..f7d3f66 --- /dev/null +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/vehicleStatus/service/impl/VehicleStatusServiceImpl.java @@ -0,0 +1,74 @@ +package org.nl.wms.pda.vehicleStatus.service.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.exception.BadRequestException; +import org.nl.modules.system.util.CodeUtil; +import org.nl.utils.SecurityUtils; +import org.nl.wms.WorkProcedureEnum; +import org.nl.wms.pda.vehicleStatus.service.VehicleStatusService; +import org.nl.wms.sch.manage.AreaEnum; +import org.nl.wms.sch.manage.BillTypeEnum; +import org.nl.wms.st.ivt.IvtChangeTypeEnum; +import org.nl.wms.st.ivt.StoreIvtServiceImpl; +import org.nl.wql.WQL; +import org.nl.wql.core.bean.WQLObject; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service +@RequiredArgsConstructor +@Slf4j +public class VehicleStatusServiceImpl implements VehicleStatusService { + + + @Override + public Map queryInfoBycode(Map jsonObject) { + String vehicle_code = jsonObject.get("vehicle_code"); + if (StrUtil.isEmpty(vehicle_code)) { + throw new BadRequestException("托盘号不能为空！"); + } + JSONObject resutl = WQL.getWO("QPADSERVICE").addParam("flag", "18").process().uniqueResult(0); + if (ObjectUtil.isEmpty(resutl)) { + throw new BadRequestException("未找到托盘编码为'" + vehicle_code + "'的托盘信息！"); + } + JSONObject returnjo = new JSONObject(); + returnjo.put("code", "1"); + returnjo.put("desc", "查询成功！"); + returnjo.put("result", resutl); + return returnjo; + } + + @Override + public Map Confirm(JSONObject param) { + String vehicle_code = param.getString("vehicle_code"); + String is_full = param.getString("is_full"); + if (StrUtil.isEmpty(vehicle_code)) { + throw new BadRequestException("托盘号不能为空！"); + } + if (StrUtil.isEmpty(is_full)) { + throw new BadRequestException("是否满托不能为空！"); + } + JSONObject ivtObj = WQLObject.getWQLObject("st_ivt_structivt").query("vehicle_code ='" + vehicle_code + "'").uniqueResult(0); + JSONObject groupObj = WQLObject.getWQLObject("st_buss_vehiclegroup").query("vehicle_code ='" + vehicle_code + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(ivtObj)) { + ivtObj.put("is_full", is_full); + WQLObject.getWQLObject("st_ivt_structivt").update(ivtObj); + } + if (ObjectUtil.isEmpty(groupObj)) { + groupObj.put("is_full", is_full); + WQLObject.getWQLObject("st_buss_vehiclegroup").update(groupObj); + } + JSONObject returnjo = new JSONObject(); + returnjo.put("code", "1"); + returnjo.put("desc", "操作成功！"); + return returnjo; + } + +} diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java index bdc8069..98be916 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java @@ -204,7 +204,6 @@ public class CallMaterialTask extends AbstractAcsTask { String vehicle_code = form.getString("vehicle_code"); String task_status = TaskStatusEnum.SURE_START.getCode(); String material_id = form.getString("material_id"); - String cust_id = form.getString("cust_id"); String create_mode = form.getString("create_mode"); String pcsn = form.getString("pcsn"); String is_full = form.getString("is_full"); @@ -343,7 +342,6 @@ public class CallMaterialTask extends AbstractAcsTask { iosObj.put("end_point_code", next_point_code); iosObj.put("start_area", startArea_type); iosObj.put("end_area", nextPoint.getArea_type()); - iosObj.put("cust_id", cust_id); iosObj.put("create_mode", create_mode); iosObj.put("task_id", task_id); iosObj.put("pcsn", pcsn); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/task/AutoSynchronDeviceStausTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/task/AutoSynchronDeviceStausTask.java index 77e58f3..afa9863 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/task/AutoSynchronDeviceStausTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/task/AutoSynchronDeviceStausTask.java @@ -8,6 +8,7 @@ import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.nl.wms.ext.acs.service.impl.WmsToAcsServiceImpl; +import org.nl.wms.ext.acs.service.impl.WmsToJnServiceImpl; import org.nl.wms.sch.manage.buss.CallMaterialTask; import org.nl.wql.WQL; import org.nl.wql.core.bean.WQLObject; @@ -31,6 +32,7 @@ public class AutoSynchronDeviceStausTask { //1 同步压机设备状态 this.SynchronDevice(); //2 反馈给嘉耐 + this.feedBackStatustojn(); } private void SynchronDevice() { @@ -43,27 +45,30 @@ public class AutoSynchronDeviceStausTask { JSONObject devicejo = pointarr.getJSONObject(i); String point_code = devicejo.getString("device_code"); //根据点位去找设备 - String device_code = WQL.getWO("ACSTOMES_001").addParam("flag", "6").addParam("point_code",point_code).process().uniqueResult(0).getString("device_code"); + String device_code = WQL.getWO("ACSTOMES_001").addParam("flag", "6").addParam("point_code", point_code).process().uniqueResult(0).getString("device_code"); JSONObject recordObj = recordTabele.query("device_code='" + device_code + "'").uniqueResult(0); int mode = devicejo.getIntValue("mode"); int error = devicejo.getIntValue("error"); String device_status = ""; - //2空闲，3工作中，4等待搬运 5缺料请求 - if (mode==2){ - device_status="3"; + //2空闲，3工作中，4等待搬运 5缺料请求 0 关机() + if (mode == 2) { + device_status = "3"; } - if (mode==3){ - device_status="1"; + if (mode == 3) { + device_status = "1"; } - if (mode==4){ - device_status="2"; + if (mode == 4) { + device_status = "2"; } - if (mode==5){ - device_status="5"; + if (mode == 5) { + device_status = "5"; + } + if (mode == 0) { + device_status = "6"; } - if (error >0){ - device_status="4"; + if (error > 0) { + device_status = "4"; } recordObj.put("device_status", device_status); recordObj.put("update_time", DateUtil.now()); @@ -73,6 +78,11 @@ public class AutoSynchronDeviceStausTask { } + private void feedBackStatustojn() { + WmsToJnServiceImpl wmsToJnService = new WmsToJnServiceImpl(); + wmsToJnService.feedBackStatus(new JSONObject()); + } + } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/wms.xls b/wms/hd/nladmin-system/src/main/java/org/nl/wms/wms.xls index ad3f80e71cea6c9f7a055465429df73a1a41858a..34e15a9de7c89bd6038508cd584242f07aaf1399 100644 GIT binary patch delta 22789 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 - - - - - - - - ${LOG_HOME}/ACS请求ERP/%d{yyyy-MM-dd}.%i.log - - 15 - - 200MB - - 20GB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - - - - - - - - - - diff --git a/wms/hd/nladmin-system/src/main/resources/log/AcsToWms.xml b/wms/hd/nladmin-system/src/main/resources/log/AcsToWms.xml deleted file mode 100644 index 6cbff56..0000000 --- a/wms/hd/nladmin-system/src/main/resources/log/AcsToWms.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - ${LOG_HOME}/ACS请求WMS/%d{yyyy-MM-dd}.%i.log - - 15 - - 200MB - - 20GB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - - - - - - - - - - diff --git a/wms/hd/nladmin-system/src/main/resources/log/AgvServiceImpl.xml b/wms/hd/nladmin-system/src/main/resources/log/AgvServiceImpl.xml deleted file mode 100644 index aa005b1..0000000 --- a/wms/hd/nladmin-system/src/main/resources/log/AgvServiceImpl.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - ${LOG_HOME}/反馈AGV请求/%d{yyyy-MM-dd}.%i.log - - 15 - - 200MB - - 20GB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - - - - - - - - - - diff --git a/wms/hd/nladmin-system/src/main/resources/log/AgvackServlet.xml b/wms/hd/nladmin-system/src/main/resources/log/AgvackServlet.xml deleted file mode 100644 index 288d587..0000000 --- a/wms/hd/nladmin-system/src/main/resources/log/AgvackServlet.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - ${LOG_HOME}/AGV请求离开/%d{yyyy-MM-dd}.%i.log - - 15 - - 200MB - - 20GB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - - - - - - - - - - diff --git a/wms/hd/nladmin-system/src/main/resources/log/AutoCreateInst.xml b/wms/hd/nladmin-system/src/main/resources/log/AutoCreateInst.xml deleted file mode 100644 index fe653c6..0000000 --- a/wms/hd/nladmin-system/src/main/resources/log/AutoCreateInst.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - ${LOG_HOME}/自动创建指令/%d{yyyy-MM-dd}.%i.log - - 15 - - 200MB - - 20GB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - - - - - - - - - diff --git a/wms/hd/nladmin-system/src/main/resources/log/NDCSocketConnectionAutoRun.xml b/wms/hd/nladmin-system/src/main/resources/log/NDCSocketConnectionAutoRun.xml deleted file mode 100644 index adb00cb..0000000 --- a/wms/hd/nladmin-system/src/main/resources/log/NDCSocketConnectionAutoRun.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - ${LOG_HOME}/DNC/%d{yyyy-MM-dd}.%i.log - - 15 - - 200MB - - 20GB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - - - - - - - - - - diff --git a/wms/hd/nladmin-system/src/main/resources/log/QueryAgvTaskStatus.xml b/wms/hd/nladmin-system/src/main/resources/log/QueryAgvTaskStatus.xml deleted file mode 100644 index 3d40818..0000000 --- a/wms/hd/nladmin-system/src/main/resources/log/QueryAgvTaskStatus.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - ${LOG_HOME}/查询AGV指令状态/%d{yyyy-MM-dd}.%i.log - - 15 - - 200MB - - 20GB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - - - - - - - - - - diff --git a/wms/hd/nladmin-system/src/main/resources/log/QueryXZAgvTaskStatus.xml b/wms/hd/nladmin-system/src/main/resources/log/QueryXZAgvTaskStatus.xml deleted file mode 100644 index 5efe75a..0000000 --- a/wms/hd/nladmin-system/src/main/resources/log/QueryXZAgvTaskStatus.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - ${LOG_HOME}/查询仙知AGV指令状态/%d{yyyy-MM-dd}.%i.log - - 15 - - 200MB - - 20GB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - - - - - - - - - - diff --git a/wms/hd/nladmin-system/src/main/resources/log/WmsToAcs.xml b/wms/hd/nladmin-system/src/main/resources/log/WmsToAcs.xml deleted file mode 100644 index 0efd084..0000000 --- a/wms/hd/nladmin-system/src/main/resources/log/WmsToAcs.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - ${LOG_HOME}/WMS下发ACS/%d{yyyy-MM-dd}.%i.log - - 15 - - 200MB - - 20GB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - - - - - - - - - -