From 3d2336fa04f682944965117cae5ccad1a2811751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?= Date: Fri, 2 Jun 2023 14:24:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=8C=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/basedata/wql/QMD_PB_VEHICLE_GROUP.wql | 2 +- .../acs/service/impl/AcsToWmsServiceImpl.java | 26 ++- .../org/nl/wms/pda/rest/PdaController.java | 73 +++++++- .../org/nl/wms/pda/service/PdaService.java | 31 ++++ .../wms/pda/service/impl/PdaServiceImpl.java | 157 +++++++++++++++++- .../src/main/java/org/nl/wms/sch/AcsUtil.java | 2 +- .../nl/wms/sch/manage/wql/MANAGE_QUERY.wql | 2 +- .../sch/task/call/empty/YZCallEmptyTask.java | 22 ++- .../task/call/empty/wql/CALL_EMPTY_TASK.wql | 1 + .../send/material/FJSendMaterialTask.java | 2 + .../send/material/HLSendMaterialTask.java | 2 +- .../send/material/wql/SEND_MATERIAL_TASK.wql | 2 +- .../sch/task/to/pack/BTHCToPackageTask.java | 2 + .../wms/sch/task/to/pack/FJToPackageTask.java | 2 + .../org/nl/wms/sch/wql/QSCH_BASE_POINT.wql | 2 +- .../src/main/java/org/nl/wms/wms.xls | Bin 280064 -> 280576 bytes .../src/test/java/org/nl/test/TempTest.java | 9 +- lms/nladmin-ui/.env.production | 4 +- lms/nladmin-ui/public/config.js | 4 +- .../wms/basedata/vehicle/group/index.vue | 35 ++-- .../src/views/wms/pdm/workerorder/index.vue | 2 +- .../src/views/wms/sch/point/index.vue | 2 +- .../src/views/wms/sch/task/index.vue | 2 +- 23 files changed, 337 insertions(+), 49 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_VEHICLE_GROUP.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_VEHICLE_GROUP.wql index 829cbba..2de6b9b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_VEHICLE_GROUP.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_VEHICLE_GROUP.wql @@ -49,7 +49,7 @@ st_ivt_vehicle_detail vd LEFT JOIN sch_base_point p ON p.point_code = vd.point_code WHERE - 1 = 1 + vd.is_delete = '0' OPTION 输入.vehicle_code <> "" vd.vehicle_code LIKE '%' 输入.vehicle_code '%' ENDOPTION diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 30afa8e..6e5dfb8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -20,6 +20,7 @@ import org.nl.wms.basedata.eum.VehicleType; import org.nl.wms.basedata.service.dto.VehicleDto; import org.nl.wms.common.PickType; import org.nl.wms.ext.acs.service.AcsToWmsService; +import org.nl.wms.ext.acs.service.WmsToAcsService; import org.nl.wms.sch.manage.*; import org.nl.wms.sch.task.call.empty.FJCallEmptyTask; import org.nl.wms.sch.task.call.empty.GTKCallEmptyTask; @@ -81,6 +82,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { private final SZCallMaterialTask szCallMaterialTask; + private final WmsToAcsService wmsToAcsService; + /** * task_id：任务标识 * task_code：任务编码 @@ -89,7 +92,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { * @param string 条件 * @return zss */ - @Transactional(rollbackFor = Exception.class) @Override public Map receiveTaskStatusAcs(String string) { JSONArray array = JSONArray.parseArray(string); @@ -261,6 +263,25 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { vd_update.put("update_time", now); vd_table.update(vd_update, "vehicle_type = '1' AND vehicle_code = '" + vehicle_code + "' AND is_delete = '0'"); + String device_code = workorder.getString("device_code"); + JSONObject result = wmsToAcsService.getDeviceStatus( + new JSONArray() {{ + add(new JSONObject() {{ + put("device_code", device_code); + }}); + }}); + if (!"200".equals(result.getString("status"))) { + throw new BadRequestException("[" + device_code + "] ACS未返回设备信息！"); + } + JSONArray data = result.getJSONArray("data"); + if (ObjectUtil.isEmpty(data)) { + throw new BadRequestException("[" + device_code + "] ACS未返回设备信息！"); + } + String mix_num = data.getJSONObject(0).getString("mix_num"); + if (StrUtil.isBlank(mix_num)) { + throw new BadRequestException("未知碾次！"); + } + JSONObject vd = new JSONObject(); vd.put("vd_id", IdUtil.getSnowflake(1L, 1L).nextId()); vd.put("vehicle_type", VehicleType.CUP.value()); @@ -274,6 +295,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { vd.put("create_time", now); vd.put("is_in_kiln", "0"); vd.put("stand_status", StandStatus.STANDING.value()); + vd.put("mix_num", mix_num); vd_table.insert(vd); method_param.put("vd", vd); @@ -963,7 +985,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { JSONObject info = WQL .getWO("ACS_TO_WMS") .addParam("flag", "3") - .addParam("vehicle_type", vehicle_type) + .addParam("vehicle_type", String.valueOf(vehicle_type)) .addParam("vehicle_code", vehicle_code) .process() .uniqueResult(0); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/rest/PdaController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/rest/PdaController.java index 05efc93..1907350 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/rest/PdaController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/rest/PdaController.java @@ -74,9 +74,22 @@ public class PdaController { return PdaUtils.buildSuccessResultJSON(pdaService.device(func)); } + @PostMapping("/vehicleType") + @Log("查询载具类型") + @ApiOperation("查询载具类型") + @PdaAnnotation + public JSONObject vehicleType(@RequestBody JSONObject param) { + String func = param.getString("func"); + if (StrUtil.isBlank(func)) { + throw new BadRequestException("未知功能！"); + } + + return PdaUtils.buildSuccessResultJSON(pdaService.vehicleType(func)); + } + @PostMapping("/report") - @Log("查询设备") - @ApiOperation("查询设备") + @Log("不合格品上报") + @ApiOperation("不合格品上报") @PdaAnnotation public JSONObject report(@RequestBody JSONObject param) { String func = param.getString("func"); @@ -103,7 +116,7 @@ public class PdaController { public JSONObject sendMaterial(@RequestBody JSONObject param) { String point_code = param.getString("point_code"); if (StrUtil.isBlank(point_code)) { - throw new BadRequestException("点位编码不能为空！"); + throw new BadRequestException("点位不能为空！"); } String vehicle_code = param.getString("vehicle_code"); vehicle_code = TaskUtils.formatVehicleCode(vehicle_code); @@ -134,7 +147,7 @@ public class PdaController { public JSONObject callMaterial(@RequestBody JSONObject param) { String point_code = param.getString("point_code"); if (StrUtil.isBlank(point_code)) { - throw new BadRequestException("点位编码不能为空！"); + throw new BadRequestException("点位不能为空！"); } pdaService.callMaterial(point_code, param.toJSONString()); @@ -148,7 +161,7 @@ public class PdaController { public JSONObject sendEmpty(@RequestBody JSONObject param) { String point_code = param.getString("point_code"); if (StrUtil.isBlank(point_code)) { - throw new BadRequestException("点位编码不能为空！"); + throw new BadRequestException("点位不能为空！"); } String vehicle_code = TaskUtils.formatVehicleCode(param.getString("vehicle_code")); if ("0000".equals(vehicle_code)) { @@ -158,4 +171,54 @@ public class PdaController { pdaService.sendEmpty(point_code, vehicle_code, param.toJSONString()); return PdaUtils.buildSuccessResultJSON(null); } + + @PostMapping("/callEmpty") + @Log("叫空") + @ApiOperation("叫空") + @PdaAnnotation + public JSONObject callEmpty(@RequestBody JSONObject param) { + String point_code = param.getString("point_code"); + if (StrUtil.isBlank(point_code)) { + throw new BadRequestException("点位不能为空！"); + } + + pdaService.callEmpty(point_code, param.toJSONString()); + return PdaUtils.buildSuccessResultJSON(null); + } + + @PostMapping("/standStatus") + @Log("困料管理") + @ApiOperation("困料管理") + @PdaAnnotation + public JSONObject standStatus(@RequestBody JSONObject param) { + String vehicle_code = TaskUtils.formatVehicleCode(param.getString("vehicle_code")); + if ("0000".equals(vehicle_code)) { + throw new BadRequestException("载具编码不能为空！"); + } + String type = param.getString("type"); + if (StrUtil.isBlank(type)) { + throw new BadRequestException("操作类型不能为空！"); + } + + pdaService.standStatus(vehicle_code, type); + return PdaUtils.buildSuccessResultJSON(null); + } + + @PostMapping("/inKiln") + @Log("入窑管理") + @ApiOperation("入窑管理") + @PdaAnnotation + public JSONObject inKiln(@RequestBody JSONObject param) { + String vehicle_code = TaskUtils.formatVehicleCode(param.getString("vehicle_code")); + if ("0000".equals(vehicle_code)) { + throw new BadRequestException("载具编码不能为空！"); + } + String type = param.getString("type"); + if (StrUtil.isBlank(type)) { + throw new BadRequestException("操作类型不能为空！"); + } + + pdaService.inKiln(vehicle_code, type); + return PdaUtils.buildSuccessResultJSON(null); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/service/PdaService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/service/PdaService.java index 9eaa038..24e61b1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/service/PdaService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/service/PdaService.java @@ -36,6 +36,14 @@ public interface PdaService { */ JSONArray device(String func); + /** + * 查询载具类型 + * + * @param func 手持功能 + * @return 标签 值 + */ + JSONArray vehicleType(String func); + /** * 不合格品上报 * @@ -69,4 +77,27 @@ public interface PdaService { * @param vehicle_code 载具编码 */ void sendEmpty(String point_code, String vehicle_code, String request_param); + + /** + * 叫空 + * + * @param point_code 点位编码 + */ + void callEmpty(String point_code, String request_param); + + /** + * 困料管理 + * + * @param vehicle_code 载具编码 + * @param type 操作类型 + */ + void standStatus(String vehicle_code, String type); + + /** + * 入窑管理 + * + * @param vehicle_code 载具编码 + * @param type 操作类型 + */ + void inKiln(String vehicle_code, String type); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java index 5af0603..0e8a2fb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java @@ -4,6 +4,7 @@ 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.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; @@ -14,11 +15,15 @@ import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.basedata.eum.TrueOrFalse; import org.nl.wms.basedata.eum.VehicleType; +import org.nl.wms.ext.acs.service.WmsToAcsService; import org.nl.wms.pda.service.PdaService; import org.nl.wms.sch.manage.ACSSystem; import org.nl.wms.sch.manage.CreateMode; import org.nl.wms.sch.manage.PointStatus; import org.nl.wms.sch.manage.Region; +import org.nl.wms.sch.task.call.empty.FJCallEmptyTask; +import org.nl.wms.sch.task.call.empty.HLCallEmptyTask; +import org.nl.wms.sch.task.call.empty.YZCallEmptyTask; import org.nl.wms.sch.task.call.material.FJCallMaterialTask; import org.nl.wms.sch.task.call.material.YZCallMaterialTask; import org.nl.wms.sch.task.send.empty.FJSendEmptyTask; @@ -53,9 +58,19 @@ public class PdaServiceImpl implements PdaService { private final FJSendEmptyTask fjSendEmptyTask; + private final HLCallEmptyTask hlCallEmptyTask; + + private final YZCallEmptyTask yzCallEmptyTask; + + private final FJCallEmptyTask fjCallEmptyTask; + + private final WmsToAcsService wmsToAcsService; + @Override public JSONArray region(String func) { switch (func) { + case "call_empty": + // 叫空 case "send_material": // 送料 return WQL @@ -177,6 +192,36 @@ public class PdaServiceImpl implements PdaService { default: throw new BadRequestException(region.label() + "没有送空点位！"); } + case "call_empty": + // 叫空 + switch (region) { + case HL: + return WQL + .getWO("PDA") + .addParam("flag", "2") + .addParam("region_code", region_code) + .addParam("point_type", "('1', '2')") + .process() + .getResultJSONArray(0); + case YZ: + return WQL + .getWO("PDA") + .addParam("flag", "2") + .addParam("region_code", region_code) + .addParam("point_type", "('1')") + .process() + .getResultJSONArray(0); + case FJ: + return WQL + .getWO("PDA") + .addParam("flag", "2") + .addParam("region_code", region_code) + .addParam("point_type", "('2')") + .process() + .getResultJSONArray(0); + default: + throw new BadRequestException(region.label() + "没有叫空点位！"); + } default: throw new BadRequestException("未知功能！"); } @@ -191,6 +236,11 @@ public class PdaServiceImpl implements PdaService { .getResultJSONArray(0); } + @Override + public JSONArray vehicleType(String func) { + return WQLObject.getWQLObject("sys_dict_detail").query("name = 'vehicle_type'", "dict_sort ASC").getResultJSONArray(0); + } + @Transactional(rollbackFor = Exception.class) @Override public void report(String device_code, String unqualified_qty) { @@ -261,13 +311,11 @@ public class PdaServiceImpl implements PdaService { if (Region.FJ.value().equals(region_code)) { vd.put("is_package", TrueOrFalse.TRUE.value()); } - vd_table.insert(vd); Region region = Region.get(point.getString("region_code")); JSONObject method_param = new JSONObject(); method_param.put("point", point); method_param.put("workorder", workorder); - method_param.put("vd", vd); method_param.put("create_mode", CreateMode.SCCJ.value()); method_param.put("request_param", request_param); method_param.put("create_id", user_id); @@ -275,12 +323,37 @@ public class PdaServiceImpl implements PdaService { switch (region) { case HL: + String device_code = workorder.getString("device_code"); + JSONObject result = wmsToAcsService.getDeviceStatus( + new JSONArray() {{ + add(new JSONObject() {{ + put("device_code", device_code); + }}); + }}); + if (!"200".equals(result.getString("status"))) { + throw new BadRequestException("[" + device_code + "] ACS未返回设备信息！"); + } + JSONArray data = result.getJSONArray("data"); + if (ObjectUtil.isEmpty(data)) { + throw new BadRequestException("[" + device_code + "] ACS未返回设备信息！"); + } + String mix_num = data.getJSONObject(0).getString("mix_num"); + if (StrUtil.isBlank(mix_num)) { + throw new BadRequestException("未知碾次！"); + } + vd.put("mix_num", mix_num); + vd_table.insert(vd); + method_param.put("vd", vd); hlSendMaterialTask.createTask(method_param); break; case YZ: + vd_table.insert(vd); + method_param.put("vd", vd); yzSendMaterialTask.createTask(method_param); break; case FJ: + vd_table.insert(vd); + method_param.put("vd", vd); fjSendMaterialTask.createTask(method_param); default: throw new BadRequestException("[" + region.label() + "] 不能发起送料任务！"); @@ -385,4 +458,84 @@ public class PdaServiceImpl implements PdaService { throw new BadRequestException("[" + region.label() + "] 不能发起送空任务！"); } } + + @Override + public void callEmpty(String point_code, String request_param) { + JSONObject point = WQLObject + .getWQLObject("sch_base_point") + .query("is_used = '1' AND point_code = '" + point_code + "'") + .uniqueResult(0); + if (ObjectUtil.isEmpty(point)) { + throw new BadRequestException("[" + point_code + "] 已删除或未启用！"); + } + TaskUtils.pointNameIsLocked(point); + + Region region = Region.get(point.getString("region_code")); + JSONObject method_param = new JSONObject(); + method_param.put("point", point); + method_param.put("create_mode", CreateMode.SCCJ.value()); + method_param.put("request_param", request_param); + method_param.put("create_id", SecurityUtils.getCurrentUserId()); + method_param.put("create_name", SecurityUtils.getCurrentNickName()); + + switch (region) { + case HL: + JSONObject workorder = WQLObject + .getWQLObject("pdm_bd_workorder") + .query("is_delete = '0' AND device_code = '" + point.getString("device_code") + "' AND order_status = '3'") + .uniqueResult(0); + method_param.put("workorder", workorder); + hlCallEmptyTask.createTask(method_param); + break; + case YZ: + workorder = WQLObject + .getWQLObject("pdm_bd_workorder") + .query("is_delete = '0' AND device_code = '" + point.getString("device_code") + "' AND order_status = '3'") + .uniqueResult(0); + method_param.put("workorder", workorder); + yzCallEmptyTask.createTask(method_param); + break; + case FJ: + workorder = TaskUtils.hasWorkOrder(point); + method_param.put("workorder", workorder); + fjCallEmptyTask.createTask(method_param); + break; + default: + throw new BadRequestException("[" + region.label() + "] 不能发起叫空任务！"); + } + } + + @Override + public void standStatus(String vehicle_code, String type) { + JSONObject vehicle_update = new JSONObject(); + switch (type) { + case "1": + vehicle_update.put("stand_status", "4"); + break; + case "2": + vehicle_update.put("stand_status", "5"); + break; + default: + throw new BadRequestException("未知操作！"); + } + TaskUtils.addCurrentUpdateColum(vehicle_update); + WQLObject.getWQLObject("st_ivt_vehicle_detail").update(vehicle_update, "vehicle_type = '1' AND vehicle_code = '" + vehicle_code + "'"); + } + + @Override + public void inKiln(String vehicle_code, String type) { + JSONObject vehicle_update = new JSONObject(); + switch (type) { + case "1": + vehicle_update.put("is_in_kiln", "1"); + break; + case "2": + vehicle_update.put("is_in_kiln", "0"); + break; + default: + throw new BadRequestException("未知操作！"); + } + TaskUtils.addCurrentUpdateColum(vehicle_update); + WQLObject.getWQLObject("st_ivt_vehicle_detail").update(vehicle_update, "vehicle_type = '2' AND vehicle_code = '" + vehicle_code + "'"); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java index c9aef1b..414f57e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java @@ -40,7 +40,7 @@ public class AcsUtil { //ConnectException: Connection refused: connect //网络不通 System.out.println(msg); - result.put("status", HttpStatus.BAD_REQUEST); + result.put("status", HttpStatus.BAD_REQUEST.value()); result.put("message", msg); } //acs抛异常这里 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/wql/MANAGE_QUERY.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/wql/MANAGE_QUERY.wql index 1decb7a..2e574ff 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/wql/MANAGE_QUERY.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/wql/MANAGE_QUERY.wql @@ -65,7 +65,7 @@ WHERE vd.is_delete = '0' AND vd.vehicle_type = '1' - AND vd.stand_status IN ('3', '4') + AND vd.stand_status = '3' ENDSELECT ENDQUERY ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/YZCallEmptyTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/YZCallEmptyTask.java index 475086d..bcb9666 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/YZCallEmptyTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/YZCallEmptyTask.java @@ -42,8 +42,10 @@ public class YZCallEmptyTask extends AbstractAcsTask { JSONObject point = form.getJSONObject("point"); JSONObject work_order = form.getJSONObject("workorder"); int priority = 1; + String material_id = null; if (ObjectUtil.isNotEmpty(work_order)) { priority = TrueOrFalse.trueOrFalse(work_order.getString("is_urgent")) ? 50 : 1; + material_id = work_order.getString("material_id"); } JSONObject task = TaskUtils.buildTask( @@ -53,7 +55,7 @@ public class YZCallEmptyTask extends AbstractAcsTask { null, point.getString("point_code"), null, - null, + material_id, VehicleType.STEEL_TRAY.value(), null, priority, @@ -86,13 +88,19 @@ public class YZCallEmptyTask extends AbstractAcsTask { for (int i = 0; i < tasks.size(); i++) { JSONObject task = tasks.getJSONObject(i); - JSONObject point = WQL - .getWO("CALL_EMPTY_TASK") - .addParam("flag", "1") - .addParam("point_code", task.getString("point_code2")) - .process() - .uniqueResult(0); + JSONObject point = null; + String material_id = task.getString("material_id"); + if (StrUtil.isNotBlank(material_id)) { + point = WQL + .getWO("CALL_EMPTY_TASK") + .addParam("flag", "1") + .addParam("point_code", task.getString("point_code2")) + .addParam("material_id", material_id) + .process() + .uniqueResult(0); + } if (ObjectUtil.isEmpty(point)) { + task.put("material_id", null); point = WQL .getWO("CALL_EMPTY_TASK") .addParam("flag", "2") diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/wql/CALL_EMPTY_TASK.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/wql/CALL_EMPTY_TASK.wql index ca1746f..64eef90 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/wql/CALL_EMPTY_TASK.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/wql/CALL_EMPTY_TASK.wql @@ -56,6 +56,7 @@ AND point.vehicle_type = '2' AND vd.is_delete = '0' AND vd.point_code = 输入.point_code + AND vd.material_id = 输入.material_id AND vd.is_full = '0' AND vd.is_in_kiln = '0' ENDSELECT diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/FJSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/FJSendMaterialTask.java index 1cd2d02..0e035e7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/FJSendMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/FJSendMaterialTask.java @@ -314,11 +314,13 @@ public class FJSendMaterialTask extends AbstractAcsTask { JSONObject regionIn = TaskUtils.buildRegionInFromTask(task, RegionInType.WGRK); WQLObject.getWQLObject("st_ivt_regionio").insert(regionIn); + JSONObject vd = WQLObject.getWQLObject("st_ivt_vehicle_detail").query("vd_id = " + task.getString("group_id")).uniqueResult(0); JSONArray param = new JSONArray(); JSONObject info = new JSONObject(); info.put("device_code", point_code2); info.put("vehicle_type", task.getIntValue("vehicle_type") - 2); info.put("vehicle_code", task.getString("vehicle_code")); + info.put("is_package", vd.getString("is_package")); param.add(info); wmsToAcsService.writeVehicle(param); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/HLSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/HLSendMaterialTask.java index 9f90864..fb6c85c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/HLSendMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/HLSendMaterialTask.java @@ -259,7 +259,7 @@ public class HLSendMaterialTask extends AbstractAcsTask { JSONObject workorder = WQL .getWO("SEND_MATERIAL_TASK") .addParam("flag", "7") - .addParam("vd_id", task.getLongValue("group_id")) + .addParam("vd_id", task.getString("group_id")) .process() .uniqueResult(0); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/wql/SEND_MATERIAL_TASK.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/wql/SEND_MATERIAL_TASK.wql index fc84835..b2ed933 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/wql/SEND_MATERIAL_TASK.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/wql/SEND_MATERIAL_TASK.wql @@ -156,7 +156,7 @@ QUERY SELECT vd.weight, - workorder.workorder_id + workorder.workorder_id, workorder.real_qty FROM st_ivt_vehicle_detail vd diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/to/pack/BTHCToPackageTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/to/pack/BTHCToPackageTask.java index 972a11f..62e1bd3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/to/pack/BTHCToPackageTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/to/pack/BTHCToPackageTask.java @@ -231,11 +231,13 @@ public class BTHCToPackageTask extends AbstractAcsTask { JSONObject regionIn = TaskUtils.buildRegionInFromTask(task, RegionInType.WGRK); WQLObject.getWQLObject("st_ivt_regionio").insert(regionIn); + JSONObject vd = WQLObject.getWQLObject("st_ivt_vehicle_detail").query("vd_id = " + task.getString("group_id")).uniqueResult(0); JSONArray param = new JSONArray(); JSONObject info = new JSONObject(); info.put("device_code", point_code2); info.put("vehicle_type", task.getIntValue("vehicle_type") - 2); info.put("vehicle_code", task.getString("vehicle_code")); + info.put("is_package", vd.getString("is_package")); param.add(info); wmsToAcsService.writeVehicle(param); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/to/pack/FJToPackageTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/to/pack/FJToPackageTask.java index c556441..03013fd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/to/pack/FJToPackageTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/to/pack/FJToPackageTask.java @@ -233,11 +233,13 @@ public class FJToPackageTask extends AbstractAcsTask { JSONObject regionIn = TaskUtils.buildRegionInFromTask(task, RegionInType.WGRK); WQLObject.getWQLObject("st_ivt_regionio").insert(regionIn); + JSONObject vd = WQLObject.getWQLObject("st_ivt_vehicle_detail").query("vd_id = " + task.getString("group_id")).uniqueResult(0); JSONArray param = new JSONArray(); JSONObject info = new JSONObject(); info.put("device_code", point_code2); info.put("vehicle_type", task.getIntValue("vehicle_type") - 2); info.put("vehicle_code", task.getString("vehicle_code")); + info.put("is_package", vd.getString("is_package")); param.add(info); wmsToAcsService.writeVehicle(param); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_BASE_POINT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_BASE_POINT.wql index 2132c12..816cf5c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_BASE_POINT.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_BASE_POINT.wql @@ -53,7 +53,7 @@ material.material_code FROM sch_base_point point - LEFT JOIN st_ivt_vehicle_detail vd ON point.vehicle_code = vd.vehicle_code AND vd.is_delete = '0' + LEFT JOIN st_ivt_vehicle_detail vd ON point.vehicle_type = vd.vehicle_type AND point.vehicle_code = vd.vehicle_code AND vd.is_delete = '0' LEFT JOIN md_me_materialbase material ON vd.material_id = material.material_id WHERE 1 = 1 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls index 57ba4ad661b62ff9a343f4f804827f033aa63e74..0633b6f54490965ca17d1322f69fb4192a56fde8 100644 GIT binary patch delta 12352 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 - + - + - + - + - + - + 否 @@ -85,11 +85,12 @@ style="width: 100%;" @selection-change="crud.selectionChangeHandler" > - + + :min-width="flexWidth('vehicle_type',crud.data,'类型一木托盘')" + > @@ -99,21 +100,17 @@ label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" /> - - - - - - + + + + - + diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue index 88867c6..c87601c 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue @@ -209,7 +209,7 @@ - + diff --git a/lms/nladmin-ui/src/views/wms/sch/task/index.vue b/lms/nladmin-ui/src/views/wms/sch/task/index.vue index 3a70e4b..75db173 100644 --- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue +++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue @@ -96,7 +96,7 @@ - +