From 514f372270b181f82e4deff98f8d0f38ace63183 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 16 十月 2026 18:03:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新疆_塔河种业' into dev_新疆_塔河种业
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesDetailServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesDetailServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesDetailServiceImpl.java
index 8cb2e81..7303e8d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesDetailServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesDetailServiceImpl.java
@@ -6,7 +6,7 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDetailDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesLineDO;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.productsales.MesWmProductSalesDetailMapper;
-import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.wm.materialstock.MesWmMaterialStockService;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
import jakarta.annotation.Resource;
@@ -22,7 +22,7 @@
/**
* MES 閿�鍞嚭搴撴槑缁� Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -32,7 +32,7 @@
private MesWmProductSalesDetailMapper productSalesDetailMapper;
@Resource
- private MesMdItemService itemService;
+ private MesMdmItemService mdmItemService;
@Resource
@Lazy
private MesWmProductSalesLineService productSalesLineService;
@@ -55,7 +55,8 @@
@Override
public void updateProductSalesDetail(MesWmProductSalesDetailSaveReqVO updateReqVO) {
// 鏍￠獙瀛樺湪
- validateProductSalesDetailExists(updateReqVO.getId());
+ MesWmProductSalesDetailDO existing = validateProductSalesDetailExists(updateReqVO.getId());
+ if (existing.getBagCodeId() != null) throw new IllegalArgumentException("鎵爜琚嬬爜鏄庣粏涓嶈兘鎵嬪伐淇敼鏁伴噺鎴栧簱瀛橈紝璇峰垹闄ゅ悗閲嶆柊鎵爜閫夋嫨");
// 鏍￠獙鏁版嵁
validateProductSalesDetailSaveData(updateReqVO);
@@ -115,7 +116,7 @@
throw exception(WM_PRODUCT_SALES_DETAIL_LINE_NOT_MATCH);
}
// 鏍￠獙鐗╂枡瀛樺湪
- itemService.validateItemExistsAndEnable(reqVO.getItemId());
+ mdmItemService.validateItemExistsAndEnable(reqVO.getItemId());
if (ObjUtil.notEqual(line.getItemId(), reqVO.getItemId())) {
throw exception(WM_PRODUCT_SALES_DETAIL_ITEM_MISMATCH);
}
--
Gitblit v1.9.3