From 09a81820796961dda8db82d3048c680f2de95cba Mon Sep 17 00:00:00 2001 From: zengchenxi Date: Thu, 1 Feb 2024 13:36:22 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E3=80=91=E5=AE=8C=E6=88=90=E6=A8=A1=E5=85=B7=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverorder/vo/DeliverOrderRespVO.java | 8 + .../deliverorder/DeliverOrderDO.java | 17 +- .../deliverorder/DeliverOrderMapper.java | 4 +- .../src/views/heli/deliverorder/detail.vue | 21 +- .../heli/deliverorder/shipmentsPrint.vue | 588 ++++++++++++++++++ .../views/heli/projectorder/startprint.vue | 2 +- 6 files changed, 627 insertions(+), 13 deletions(-) create mode 100644 mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/shipmentsPrint.vue diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/vo/DeliverOrderRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/vo/DeliverOrderRespVO.java index 4f4e3390..4b74450c 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/vo/DeliverOrderRespVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/vo/DeliverOrderRespVO.java @@ -120,4 +120,12 @@ public class DeliverOrderRespVO { @ExcelProperty("发货人姓名") private String deliverPersonName; + @Schema(description = "制单人姓名") + @ExcelProperty("制单人姓名") + private String creatorName; + + @Schema(description = "业务员姓名") + @ExcelProperty("业务员姓名") + private String businessManName; + } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/deliverorder/DeliverOrderDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/deliverorder/DeliverOrderDO.java index 6cfbb1d4..6f9f5d5f 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/deliverorder/DeliverOrderDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/deliverorder/DeliverOrderDO.java @@ -1,14 +1,15 @@ package com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverorder; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.chanko.yunxi.mes.framework.mybatis.core.dataobject.BaseDO; import com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum; import com.chanko.yunxi.mes.module.heli.enums.DeliverOrderStatusEnum; import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; + import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import com.chanko.yunxi.mes.framework.mybatis.core.dataobject.BaseDO; /** * 发货订单 DO @@ -125,6 +126,12 @@ public class DeliverOrderDO extends BaseDO { @TableField(exist = false) private String deliverPersonName; + @TableField(exist = false) + private String creatorName; + + @TableField(exist = false) + private String businessManName; + public boolean canDeliver() { return DeliverOrderStatusEnum.SAVE.getCode() == this.deliverStatus.intValue(); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/deliverorder/DeliverOrderMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/deliverorder/DeliverOrderMapper.java index 549ad153..8611003b 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/deliverorder/DeliverOrderMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/deliverorder/DeliverOrderMapper.java @@ -46,12 +46,14 @@ public interface DeliverOrderMapper extends BaseMapperX { default DeliverOrderDO selectById(Long id) { MPJLambdaWrapper query = new MPJLambdaWrapper<>(); query.selectAll(DeliverOrderDO.class) - .select("u.nickname as deliverPersonName", "e.name as customerName") + .select("u.nickname as deliverPersonName", "e.name as customerName", "u1.nickname as creatorName", "u2.nickname as businessManName") .select("GROUP_CONCAT(distinct p.code) as saleOrderCode", "GROUP_CONCAT(p.mould_name) as mouldName" , "GROUP_CONCAT(p.contract_no) as contractNo", "GROUP_CONCAT(p.property) as property") .leftJoin("project_sale_order p on FIND_IN_SET(p.id, t.sale_order_ids)") .leftJoin(CustomerDO.class, "e", CustomerDO::getId, DeliverOrderDO::getCustomerId) .leftJoin(AdminUserDO.class, "u", AdminUserDO::getId, DeliverOrderDO::getDeliverPerson) + .leftJoin(AdminUserDO.class, "u1", AdminUserDO::getId, DeliverOrderDO::getCreator) + .leftJoin("system_users u2 on u2.id = p.business_man") .eq(DeliverOrderDO::getId, id) .groupBy(DeliverOrderDO::getId) .last("LIMIT 1") 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 db2f71db..3e430d9e 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 @@ -498,11 +498,13 @@ >保 存 发 货 - 打印发货单 + + + + diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/startprint.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/startprint.vue index 37206b81..c3ae6748 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/startprint.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/startprint.vue @@ -314,7 +314,7 @@ const formData = ref({ approveUserName: undefined }) /** 打开弹窗 */ -const open = async (id?: number) => { +const open = async (id: number) => { dialogVisible.value = true resetForm() formData.value = await ProjectOrderApi.getProjectOrder(id)