From 8d1f012a368cec051f2d90f66ba4e3cd538afb3f Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Tue, 13 Jun 2023 15:12:16 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E5=B7=A5=E5=8D=95=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sch/tasks/SpeMachinery/SpeFullTask.java | 11 +++++++++++ .../service/device/dao/PdmBiDevice.java | 8 ++++---- .../dao/mapper/PdmProduceWorkorderMapper.xml | 2 ++ .../wms/product_manage/workorder/reportDialog3.vue | 6 +++--- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java index 7ef63ec2..10664762 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java @@ -177,6 +177,17 @@ public class SpeFullTask extends AbstractAcsTask { // pointService.update(new UpdateWrapper() // .set("vehicle_code",task.getVehicle_code2()) // .eq("point_code",task.getPoint_code3())); + + } + if (extParam.get("fall_finish") != null){ + PdmBiDevice one = deviceService.getOne(new QueryWrapper().eq("device_code", task.getPoint_code2())); + if (!("fall_finish"+task.getTask_id()).equals(one.getRemark())){ + deviceService.update(new UpdateWrapper() + .set("material_id", task.getMaterial_id()) + .set("deviceinstor_qty",one.getDeviceinstor_qty().add(task.getMaterial_qty())) + .set("remark","fall_finish"+task.getTask_id()) + .eq("device_code", task.getPoint_code2())); + } } if (extParam.get("take_finish") != null){ log.info("取货完成:{},vechile_code:{}",task.getTask_id(),task.getVehicle_code2()); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/PdmBiDevice.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/PdmBiDevice.java index 4744105d..0748f5a5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/PdmBiDevice.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/PdmBiDevice.java @@ -70,7 +70,7 @@ public class PdmBiDevice implements Serializable { private String device_code2; /** - * 设备来料仓上限数 + * 设备上料料斗上限数 */ private BigDecimal inupperlimit_qty; @@ -80,7 +80,7 @@ public class PdmBiDevice implements Serializable { private BigDecimal inlowerlimit_qty; /** - * 设备产品仓上限数 + * 设备满料框上限：每筐数量 */ private BigDecimal outupperlimit_qty; @@ -95,13 +95,13 @@ public class PdmBiDevice implements Serializable { private BigDecimal deviceinitinstor_qty; /** - * 设备实时来料仓数:用于数量校验 + * 上（倒）料斗实时数:用于数量校验 */ private BigDecimal deviceinstor_qty; private BigDecimal deviceinstor_weight; /** - * 设备实时产品仓数 + * 满料框实时数 */ private BigDecimal deviceoutstor_qty; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml index 6fd151f0..7845e6d2 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml @@ -8,6 +8,7 @@ material.material_name, material.material_code, material.material_spec, + pdm_bi_device.outupperlimit_qty, pro.workprocedure_code, pro.workprocedure_name, user.person_name as current_produce_person_name @@ -16,6 +17,7 @@ left join md_me_materialbase material on material.material_id = ShiftOrder.material_id left join PDM_BI_WorkProcedure pro on pro.workprocedure_id = ShiftOrder.workprocedure_id left join sys_user user on user.user_id = ShiftOrder.current_produce_person_id + left join pdm_bi_device on ShiftOrder.device_code = pdm_bi_device.device_code WHERE ShiftOrder.is_delete = '0' diff --git a/mes/qd/src/views/wms/product_manage/workorder/reportDialog3.vue b/mes/qd/src/views/wms/product_manage/workorder/reportDialog3.vue index ef348cee..7675011a 100644 --- a/mes/qd/src/views/wms/product_manage/workorder/reportDialog3.vue +++ b/mes/qd/src/views/wms/product_manage/workorder/reportDialog3.vue @@ -76,15 +76,15 @@ + + +