From 4924139b894dfd31c38cb836f96588bb12687230 Mon Sep 17 00:00:00 2001 From: zxy Date: Mon, 18 May 2026 10:23:16 +0800 Subject: [PATCH] =?UTF-8?q?feat(saledelivery):=20=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=E5=8D=95=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/SaleDeliveryDetailSaveReqVO.java | 8 +- .../saledelivery/SaleDeliveryDO.java | 2 +- .../saledelivery/SaleDeliveryServiceImpl.java | 14 ++++ .../ProStorageInventorySelectDialog.vue | 4 +- .../biz/saledelivery/OrderSelectDialog.vue | 2 +- .../biz/saledelivery/SaleDeliveryForm.vue | 83 +++++++++++-------- .../src/views/biz/saledelivery/index.vue | 49 ++++++++--- 7 files changed, 109 insertions(+), 53 deletions(-) diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/saledeliverydetail/vo/SaleDeliveryDetailSaveReqVO.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/saledeliverydetail/vo/SaleDeliveryDetailSaveReqVO.java index d7e1da6..42f7609 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/saledeliverydetail/vo/SaleDeliveryDetailSaveReqVO.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/saledeliverydetail/vo/SaleDeliveryDetailSaveReqVO.java @@ -1,10 +1,8 @@ package com.ningxia.yunxi.chemmes.module.biz.controller.admin.saledeliverydetail.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import javax.validation.constraints.*; -import java.util.*; +import lombok.Data; + import java.math.BigDecimal; @Schema(description = "管理后台 - 销售出库单子新增/修改 Request VO") @@ -53,4 +51,6 @@ public class SaleDeliveryDetailSaveReqVO { @Schema(description = "发货袋数") private Integer deliveriedBagQty; + private String unit; + } diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/dataobject/saledelivery/SaleDeliveryDO.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/dataobject/saledelivery/SaleDeliveryDO.java index ecb73c0..f7dd68a 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/dataobject/saledelivery/SaleDeliveryDO.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/dataobject/saledelivery/SaleDeliveryDO.java @@ -80,7 +80,7 @@ public class SaleDeliveryDO extends BaseDO { /** * 出库人id */ - private Integer deliveryEmpId; + private String deliveryEmpId; /** * 出库人名称 */ diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/saledelivery/SaleDeliveryServiceImpl.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/saledelivery/SaleDeliveryServiceImpl.java index ead244d..c7d9043 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/saledelivery/SaleDeliveryServiceImpl.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/saledelivery/SaleDeliveryServiceImpl.java @@ -9,6 +9,8 @@ import com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.saledelivery.SaleDeli import com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.saledeliverydetail.SaleDeliveryDetailDO; import com.ningxia.yunxi.chemmes.module.biz.dal.mysql.saledelivery.SaleDeliveryMapper; import com.ningxia.yunxi.chemmes.module.biz.dal.mysql.saledeliverydetail.SaleDeliveryDetailMapper; +import com.ningxia.yunxi.chemmes.module.system.dal.dataobject.user.AdminUserDO; +import com.ningxia.yunxi.chemmes.module.system.dal.mysql.user.AdminUserMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; @@ -19,6 +21,7 @@ import java.time.format.DateTimeFormatter; import java.util.List; import static com.ningxia.yunxi.chemmes.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.ningxia.yunxi.chemmes.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; /** * 销售出库单主 Service 实现类 @@ -35,6 +38,9 @@ public class SaleDeliveryServiceImpl implements SaleDeliveryService { @Resource private SaleDeliveryDetailMapper saleDeliveryDetailMapper; + @Resource + private AdminUserMapper adminUserMapper; + @Override @Transactional(rollbackFor = Exception.class) @@ -43,6 +49,14 @@ public class SaleDeliveryServiceImpl implements SaleDeliveryService { createReqVO.setSaleDeliveryNo(saleDeliveryNo); // 插入 SaleDeliveryDO saleDelivery = BeanUtils.toBean(createReqVO, SaleDeliveryDO.class); + //出库人 + // 获取当前登录用户信息 + + Long userId = getLoginUserId(); + AdminUserDO adminUserDO = adminUserMapper.selectById(userId); + saleDelivery.setDeliveryEmpId(String.valueOf(adminUserDO.getId())); + saleDelivery.setDeliveryEmpName(adminUserDO.getNickname()); + saleDeliveryMapper.insert(saleDelivery); createSaleDeliveryDetailList(saleDelivery.getId(), createReqVO.getDetailList()); diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/prostorageinventory/ProStorageInventorySelectDialog.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/prostorageinventory/ProStorageInventorySelectDialog.vue index 3d6a790..c52a688 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/biz/prostorageinventory/ProStorageInventorySelectDialog.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/prostorageinventory/ProStorageInventorySelectDialog.vue @@ -249,8 +249,10 @@ const handleSave = () => { const selectData = selectedRows.map(row => ({ id: row.id, storeHouseId: row.storeHouseId, + storeHouseCd: row.storeHouseCd, storeHouseName: row.storeHouseName, storeAreaId: row.storeAreaId, + storeAreCd: row.storeAreCd, storeAreaName: row.storeAreaName, lotNo: row.lotNo, packQty: row.packQty, @@ -288,6 +290,6 @@ watch(dialogVisible, (val) => { diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/saledelivery/OrderSelectDialog.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/saledelivery/OrderSelectDialog.vue index 497eb4e..5e40d23 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/biz/saledelivery/OrderSelectDialog.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/saledelivery/OrderSelectDialog.vue @@ -263,7 +263,7 @@ watch(dialogVisible, (val) => {