设备备件

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/in/ErpStockInSaveReqVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.erp.controller.admin.stock.vo.in;
 
+import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -62,6 +63,8 @@ public class ErpStockInSaveReqVO {
         @Schema(description = "备注", example = "随便")
         private String remark;
 
+        @Schema(description = "设备id", example = "100.00")
+        private Long deviceId;
     }
 
 }

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockInItemDO.java

@@ -70,4 +70,10 @@ public class ErpStockInItemDO extends BaseDO {
      */
     private String remark;
 
+    /**
+     * 关联设备id
+     *
+     * 关联 {@link ErpProductDO#getId()}
+     */
+    private Long deviceId;
 }

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockOutItemDO.java

@@ -70,4 +70,10 @@ public class ErpStockOutItemDO extends BaseDO {
      */
     private String remark;
 
+    /**
+     * 关联设备id
+     *
+     * 关联 {@link ErpProductDO#getId()}
+     */
+    private Long deviceId;
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/vo/DeviceLedgerRespVO.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.mes.controller.admin.deviceledger.vo;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.criticalcomponent.CriticalComponentDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair.DvRepairLineDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.ticketresults.TicketResultsDO;
@@ -121,10 +122,16 @@ public class DeviceLedgerRespVO extends BaseDO {
     @Schema(description = "关键件列表")
     private List<CriticalComponentDO> componentList;
 
+    @Schema(description = "备件列表")
+    private List<ErpProductDO> beijianList;
+
     @Schema(description = "附件地址")
     @ExcelProperty("附件地址")
     private String fileUrl;
 
     @Schema(description = "关键件id")
     private String componentId;
+
+    @Schema(description = "备件id")
+    private String beijianId;
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/vo/DeviceLedgerSaveReqVO.java

@@ -69,4 +69,7 @@ public class DeviceLedgerSaveReqVO {
 
     @Schema(description = "关键件，ids集合")
     private String componentId;
+
+    @Schema(description = "关键件，ids集合")
+    private String beijianId;
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/deviceledger/DeviceLedgerDO.java

@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.module.mes.dal.dataobject.deviceledger;
 
+import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductCategoryDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.criticalcomponent.CriticalComponentDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair.DvRepairLineDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.ticketresults.TicketResultsDO;
@@ -133,4 +135,15 @@ public class DeviceLedgerDO extends BaseDO {
     @TableField(exist = false)
     private List<CriticalComponentDO> componentList;
 
+    /**
+     * 备件id
+     */
+    private String beijianId;
+
+    /**
+     * 备件列表
+     */
+    @TableField(exist = false)
+    private List<ErpProductDO> beijianList;
+
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerServiceImpl.java

@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.module.mes.service.deviceledger;
 
+import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO;
+import cn.iocoder.yudao.module.erp.dal.mysql.product.ErpProductMapper;
 import cn.iocoder.yudao.module.iot.dal.dataobject.devicemodel.DeviceModelDO;
 import cn.iocoder.yudao.module.mes.controller.admin.ticketmanagement.enums.PlanTypeEnum;
 import cn.iocoder.yudao.module.mes.dal.dataobject.criticalcomponent.CriticalComponentDO;
@@ -58,6 +60,9 @@ public class DeviceLedgerServiceImpl implements DeviceLedgerService {
     @Resource
     private CriticalComponentMapper criticalComponentMapper;
 
+    @Resource
+    private ErpProductMapper productMapper;
+
     @Override
     public Long createDeviceLedger(DeviceLedgerSaveReqVO createReqVO) {
 
@@ -172,9 +177,22 @@ public class DeviceLedgerServiceImpl implements DeviceLedgerService {
             deviceLedgerDO.setComponentList(componentList);
         }
 
-
-
-
+        //备件列表
+        List<ErpProductDO> beijianList = new ArrayList<>();
+        if (StringUtils.isNotBlank(deviceLedgerDO.getBeijianId())) {
+            // 将逗号分隔的字符串转换为Long类型的List
+            List<Long> idList = Arrays.stream(deviceLedgerDO.getBeijianId().split(","))
+                    .map(String::trim) // 去除可能存在的空格
+                    .map(Long::valueOf)
+                    .collect(Collectors.toList());
+            for (Long beijianId : idList) {
+                ErpProductDO beijianDO = productMapper.selectById(beijianId);
+                if(beijianDO!=null){
+                    beijianList.add(beijianDO);
+                }
+            }
+            deviceLedgerDO.setBeijianList(beijianList);
+        }
         return deviceLedgerDO;
     }