From 87733eb3623593da247c051593d64b8ff9e1d3a4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 06 十一月 2026 19:00:39 +0800
Subject: [PATCH] feat(crm,mes): 扩展客户字段与重构批次号生成逻辑
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationServiceImpl.java | 64 +------------------------------
1 files changed, 3 insertions(+), 61 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationServiceImpl.java
index d0de3aa..d74af46 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationServiceImpl.java
@@ -9,14 +9,10 @@
import cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.MesMdWorkstationSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkshopDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
import cn.iocoder.yudao.module.mes.dal.mysql.md.workstation.MesMdWorkstationMapper;
import cn.iocoder.yudao.module.mes.enums.wm.BarcodeBizTypeEnum;
import cn.iocoder.yudao.module.mes.service.wm.barcode.MesWmBarcodeService;
-import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
-import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService;
import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
import jakarta.annotation.Resource;
@@ -55,10 +51,6 @@
private MesMdWorkshopService workshopService;
@Resource
private MesWmWarehouseService warehouseService;
- @Resource
- private MesWmWarehouseLocationService locationService;
- @Resource
- private MesWmWarehouseAreaService areaService;
@Resource
private MesWmBarcodeService barcodeService;
@Resource
@@ -144,68 +136,18 @@
}
/**
- * 鏍￠獙骞跺鐞嗕粨搴撳眰绾у叧绯�
- *
- * 浠撳簱灞傜骇缁撴瀯锛氫粨搴� -> 搴撳尯 -> 搴撲綅
- * 澶勭悊瑙勫垯锛�
- * 1. 濡傛灉浠撳簱/搴撳尯/搴撲綅閮芥湭濉啓锛屽垯鑷姩璁剧疆铏氭嫙绾胯竟搴�
- * 2. 濡傛灉濉啓浜嗗簱鍖猴紝蹇呴』濉啓浠撳簱锛屼笖搴撳尯蹇呴』灞炰簬璇ヤ粨搴�
- * 3. 濡傛灉濉啓浜嗗簱浣嶏紝蹇呴』濉啓搴撳尯锛屼笖搴撲綅蹇呴』灞炰簬璇ュ簱鍖�
+ * 澶勭悊浠撳簱锛氭湭濉啓浠撳簱鏃惰嚜鍔ㄨ缃櫄鎷熺嚎杈逛粨
*
* @param reqVO 宸ヤ綔绔欎繚瀛樿姹傚璞�
*/
private void handleWarehouseHierarchy(MesMdWorkstationSaveReqVO reqVO) {
- // 1.1 鑾峰彇浠撳簱銆佸簱鍖恒�佸簱浣� ID
Long warehouseId = reqVO.getWarehouseId();
- Long locationId = reqVO.getLocationId();
- Long areaId = reqVO.getAreaId();
- // 1.2 濡傛灉閮戒负绌猴紝鍒欒嚜鍔ㄨ缃櫄鎷熺嚎杈瑰簱
- if (warehouseId == null && locationId == null && areaId == null) {
+ if (warehouseId == null) {
MesWmWarehouseDO warehouse = warehouseService.getWarehouseByCode(MesWmWarehouseDO.WIP_VIRTUAL_WAREHOUSE);
- MesWmWarehouseLocationDO location = locationService.getWarehouseLocationByCode(
- MesWmWarehouseLocationDO.WIP_VIRTUAL_LOCATION);
- MesWmWarehouseAreaDO area = areaService.getWarehouseAreaByCode(
- MesWmWarehouseAreaDO.WIP_VIRTUAL_AREA);
reqVO.setWarehouseId(warehouse.getId());
- reqVO.setLocationId(location.getId());
- reqVO.setAreaId(area.getId());
return;
}
-
- // 2. 鏍￠獙浠撳簱鏄惁瀛樺湪
- if (warehouseId != null) {
- warehouseService.validateWarehouseExists(warehouseId);
- }
-
- // 3. 鏍￠獙搴撳尯锛氬鏋滃～鍐欎簡搴撳尯锛屽繀椤诲～鍐欎粨搴擄紝涓斿簱鍖哄繀椤诲睘浜庤浠撳簱
- MesWmWarehouseLocationDO location;
- if (locationId != null) {
- // 3.1 鏍￠獙搴撳尯鏄惁瀛樺湪
- location = locationService.validateWarehouseLocationExists(locationId);
- // 3.2 鏍￠獙蹇呴』濉啓浠撳簱
- if (warehouseId == null) {
- throw exception(WM_WAREHOUSE_REQUIRED);
- }
- // 3.3 鏍￠獙搴撳尯鏄惁灞炰簬璇ヤ粨搴�
- if (ObjUtil.notEqual(location.getWarehouseId(), warehouseId)) {
- throw exception(WM_WAREHOUSE_LOCATION_RELATION_INVALID);
- }
- }
-
- // 4. 鏍￠獙搴撲綅锛氬鏋滃～鍐欎簡搴撲綅锛屽繀椤诲～鍐欏簱鍖猴紝涓斿簱浣嶅繀椤诲睘浜庤搴撳尯
- if (areaId == null) {
- return;
- }
- // 4.1 鏍￠獙搴撲綅鏄惁瀛樺湪
- MesWmWarehouseAreaDO area = areaService.validateWarehouseAreaExists(areaId);
- // 4.2 鏍￠獙蹇呴』濉啓搴撳尯
- if (locationId == null) {
- throw exception(WM_WAREHOUSE_LOCATION_REQUIRED);
- }
- // 4.3 鏍￠獙搴撲綅鏄惁灞炰簬璇ュ簱鍖�
- if (ObjUtil.notEqual(area.getLocationId(), locationId)) {
- throw exception(WM_WAREHOUSE_AREA_RELATION_INVALID);
- }
+ warehouseService.validateWarehouseExists(warehouseId);
}
private void validateWorkstationCodeUnique(Long id, String code) {
--
Gitblit v1.9.3