From 0f792c9b3b88dc4b1b7b306f89e257d931d2d0bd Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 18 七月 2026 15:38:57 +0800
Subject: [PATCH] 代码提交
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/item/MesMdItemApiImpl.java | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/item/MesMdItemApiImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/item/MesMdItemApiImpl.java
index 230bd63..8ff44ef 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/item/MesMdItemApiImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/item/MesMdItemApiImpl.java
@@ -3,9 +3,11 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.mes.api.item.dto.MesMdItemSyncReqDTO;
import cn.iocoder.yudao.module.mes.controller.admin.md.item.vo.MesMdItemSaveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.md.item.vo.batchconfig.MesMdItemBatchConfigSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemTypeDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemBatchConfigService;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemTypeService;
import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
@@ -36,12 +38,17 @@
private MesMdItemTypeService itemTypeService;
@Resource
private MesMdUnitMeasureService unitMeasureService;
+ @Resource
+ private MesMdItemBatchConfigService itemBatchConfigService;
@Override
public Long createItem(MesMdItemSyncReqDTO syncReqDTO) {
log.info("[createItem] 鍚屾鍒涘缓 MES 鐗╂枡浜у搧锛宑ode={}", syncReqDTO.getCode());
MesMdItemSaveReqVO saveReqVO = buildSaveReqVO(syncReqDTO);
- return itemService.createItem(saveReqVO);
+ Long itemId = itemService.createItem(saveReqVO);
+ // 鍚屾鎵规閰嶇疆
+// saveBatchConfig(itemId, syncReqDTO);
+ return itemId;
}
@Override
@@ -50,12 +57,16 @@
MesMdItemSaveReqVO saveReqVO = buildSaveReqVO(syncReqDTO);
// 鎸� code 鍖归厤锛氬瓨鍦ㄥ垯鏇存柊锛屼笉瀛樺湪鍒欏垱寤猴紙upsert锛�
MesMdItemDO existItem = itemService.getItemByCode(syncReqDTO.getCode());
+ Long itemId;
if (existItem == null) {
- itemService.createItem(saveReqVO);
+ itemId = itemService.createItem(saveReqVO);
} else {
saveReqVO.setId(existItem.getId());
itemService.updateItem(saveReqVO);
+ itemId = existItem.getId();
}
+ // 鍚屾鎵规閰嶇疆
+// saveBatchConfig(itemId, syncReqDTO);
}
/**
@@ -79,4 +90,30 @@
return saveReqVO;
}
+ /**
+ * 淇濆瓨鎵规閰嶇疆
+ */
+ private void saveBatchConfig(Long itemId, MesMdItemSyncReqDTO syncReqDTO) {
+ // 妫�鏌ユ槸鍚︽湁鎵规閰嶇疆鏁版嵁
+ if (syncReqDTO.getProduceDateFlag() == null
+ && syncReqDTO.getExpireDateFlag() == null
+ && syncReqDTO.getReceiptDateFlag() == null
+ && syncReqDTO.getVendorFlag() == null
+ && syncReqDTO.getPurchaseOrderCodeFlag() == null
+ && syncReqDTO.getLotNumberFlag() == null
+ && syncReqDTO.getQualityStatusFlag() == null) {
+ return;
+ }
+ MesMdItemBatchConfigSaveReqVO configReqVO = new MesMdItemBatchConfigSaveReqVO();
+ configReqVO.setItemId(itemId);
+ configReqVO.setProduceDateFlag(syncReqDTO.getProduceDateFlag());
+ configReqVO.setExpireDateFlag(syncReqDTO.getExpireDateFlag());
+ configReqVO.setReceiptDateFlag(syncReqDTO.getReceiptDateFlag());
+ configReqVO.setVendorFlag(syncReqDTO.getVendorFlag());
+ configReqVO.setPurchaseOrderCodeFlag(syncReqDTO.getPurchaseOrderCodeFlag());
+ configReqVO.setLotNumberFlag(syncReqDTO.getLotNumberFlag());
+ configReqVO.setQualityStatusFlag(syncReqDTO.getQualityStatusFlag());
+ itemBatchConfigService.saveItemBatchConfig(configReqVO);
+ }
+
}
--
Gitblit v1.9.3