From 2a3ae07fb7823e081e20c391f23833fb407d60b9 Mon Sep 17 00:00:00 2001 From: Ledo Date: Thu, 20 Feb 2025 22:10:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=89=A9=E4=BD=99=E5=8F=91=E8=B4=A7?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E8=AE=A1=E7=AE=97=E4=B8=8D=E5=87=86=E7=A1=AE?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heli/service/projectorder/ProjectOrderServiceImpl.java | 1 + mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java index 8228998..a8a6742 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java @@ -452,6 +452,7 @@ public class ProjectOrderServiceImpl implements ProjectOrderService { deliverAmount = deliverOrderSubDOList.stream().mapToInt(DeliverOrderSubDO::getAmount).sum(); } projectOrderSubDO.setDeliverAmount(deliverAmount); + }); } diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue index 9d92b70..3bd7d2b 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue @@ -922,7 +922,7 @@ const queryData = async (type: string, id?: number) => { sub.saleOrderSubId = sub.id sub.id = '' sub.saleOrderCode = sub.projectOrderCode - sub.amounts = sub.amount - sub.deliverAmount + sub.amount = sub.amount - sub.deliverAmount }) formData.value.deliverOrderSubs = formData.value.deliverOrderSubs.concat( subList From e95c13d311cb226455c009673ac89ca78e3ffdc1 Mon Sep 17 00:00:00 2001 From: Ledo Date: Fri, 21 Feb 2025 10:51:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B4=BE=E5=B7=A5=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=8F=8Abom=E5=AE=A1=E6=A0=B8=E4=BA=BA?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heli/dal/mysql/taskdispatch/TaskDispatchMapper.java | 1 + .../heli/service/taskdispatch/TaskDispatchServiceImpl.java | 4 +++- mes-ui/mes-ui-admin-vue3/src/views/heli/shenhe/ShenheForm.vue | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchMapper.java index 1b793dc..6fa52ea 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchMapper.java @@ -58,6 +58,7 @@ public interface TaskDispatchMapper extends BaseMapperX { .leftJoin(PlanTaskBomDO.class, "i", wrapper -> wrapper.eq(PlanTaskBomDO::getTaskId, PlanTaskDO::getId).eq(PlanTaskBomDO::getBomDetailId, TaskDispatchDO::getBomDetailId)) .leftJoin(AdminUserDO.class, "u1", AdminUserDO::getId, PlanTaskBomDO::getOwner) .orderByDesc(TaskDispatchDO::getId) + .eq(ProjectOrderSubDO::getDeleted,0) .disableSubLogicDel(); query.like(!StringUtils.isEmpty(reqVO.getCode()), TaskDispatchDO::getCode, reqVO.getCode()) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java index 466d381..765dc15 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java @@ -15,6 +15,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.bdgzsomthing.bdgzsomthing import com.chanko.yunxi.mes.module.heli.dal.dataobject.equipmanufacture.EquipManufactureDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.fpuserdetail.FpUserDetailDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.plan.PlanDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderSubDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.serialnumber.SerialNumberDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDetailDO; @@ -268,7 +269,8 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { for (TaskDispatchDO taskDispatchDO : list) { Integer num ; if (numMap.get(taskDispatchDO.getProjectSubId())==null){ - num = projectOrderSubMapper.selectById(taskDispatchDO.getProjectSubId()).getAmount(); + ProjectOrderSubDO projectOrderSubDO = projectOrderSubMapper.selectById(taskDispatchDO.getProjectSubId()); + num = projectOrderSubMapper.selectById(taskDispatchDO.getProjectSubId()).getAmount(); numMap.put(taskDispatchDO.getProjectSubId(),num); }else { num= numMap.get(taskDispatchDO.getProjectSubId()); diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/shenhe/ShenheForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/shenhe/ShenheForm.vue index a06fa58..50a6fbc 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/shenhe/ShenheForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/shenhe/ShenheForm.vue @@ -37,7 +37,7 @@ v-for="dicts in getIntDictOptions(DICT_TYPE.HELI_SHENHE)" :key="dicts.value"