Merge remote-tracking branch 'origin/main'

src/main/java/org/energy/modules/leger/entity/EquipmentLedger.java

@@ -1,5 +1,7 @@
 package org.energy.modules.leger.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dayu.daf.core.mp.base.BaseEntity;
 import java.io.Serializable;
@@ -105,11 +107,13 @@ public class EquipmentLedger extends BaseEntity {
      * 出厂日期
      */
     @ApiModelProperty(value = "出厂日期")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
     private String productionDate;
     /**
      * 安装日期
      */
     @ApiModelProperty(value = "安装日期")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
     private String installDate;
     /**
      * 调试单位
@@ -175,6 +179,7 @@ public class EquipmentLedger extends BaseEntity {
      * 制造年月
      */
     @ApiModelProperty(value = "制造年月")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
     private String manufactureDate;
     /**
      * 大小尺寸
@@ -200,6 +205,7 @@ public class EquipmentLedger extends BaseEntity {
      * 投运日期
      */
     @ApiModelProperty(value = "投运日期")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
     private String operationDate;
     /**
      * 安装单位

src/main/java/org/energy/modules/system/service/impl/RoleDataServiceImpl.java

@@ -31,14 +31,8 @@ import org.energy.modules.smart.entity.WorkPermit;
 import org.energy.modules.smart.service.IOperationTicketService;
 import org.energy.modules.smart.service.IWorkOrderService;
 import org.energy.modules.smart.service.IWorkPermitService;
-import org.energy.modules.spares.entity.ManufacturerInfo;
-import org.energy.modules.spares.entity.Material;
-import org.energy.modules.spares.entity.SupplierInfo;
-import org.energy.modules.spares.entity.Warehouse;
-import org.energy.modules.spares.service.IManufacturerInfoService;
-import org.energy.modules.spares.service.IMaterialService;
-import org.energy.modules.spares.service.ISupplierInfoService;
-import org.energy.modules.spares.service.IWarehouseService;
+import org.energy.modules.spares.entity.*;
+import org.energy.modules.spares.service.*;
 import org.energy.modules.system.service.IRoleDataService;
 import org.energy.modules.system.vo.HomePageVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -74,6 +68,10 @@ public class RoleDataServiceImpl  implements IRoleDataService {
 	private IInspectionTasksService inspectionTasksService;
 	@Autowired
 	private IProductionInformationService productionInformationService;
+	@Autowired
+	private IInboundService inboundService;
+	@Autowired
+	private IOutboundService outboundService;
 
 	@Override
 	public HomePageVO findCurrHomePageInfo() {
@@ -146,6 +144,18 @@ public class RoleDataServiceImpl  implements IRoleDataService {
 		qw11.lambda().eq(ProductionInformation::getIsDiscontinue, 1);
 		hp.setProductionInformationAudit(productionInformationService.list(qw11));
 
+		// Inbound Service
+		QueryWrapper<Inbound> qw12 = new QueryWrapper<>();
+		qw12.lambda().eq(Inbound::getIstatus, 1);
+		qw12.lambda().eq(Inbound::getIsDeleted, DafConstant.DB_NOT_DELETED);
+		hp.setInboundAudit(inboundService.list(qw12));
+
+		// Outbound Service
+		QueryWrapper<Outbound> qw13 = new QueryWrapper<>();
+		qw13.lambda().eq(Outbound::getIstatus, 1);
+		qw13.lambda().eq(Outbound::getIsDeleted, DafConstant.DB_NOT_DELETED);
+		hp.setOutboundAudit(outboundService.list(qw13));
+
 		return hp;
 	}
 

src/main/java/org/energy/modules/system/vo/HomePageVO.java

@@ -8,10 +8,7 @@ import org.energy.modules.release.entity.ProductionInformation;
 import org.energy.modules.smart.entity.OperationTicket;
 import org.energy.modules.smart.entity.WorkOrder;
 import org.energy.modules.smart.entity.WorkPermit;
-import org.energy.modules.spares.entity.ManufacturerInfo;
-import org.energy.modules.spares.entity.Material;
-import org.energy.modules.spares.entity.SupplierInfo;
-import org.energy.modules.spares.entity.Warehouse;
+import org.energy.modules.spares.entity.*;
 
 import java.util.List;
 
@@ -32,6 +29,8 @@ public class HomePageVO {
 	private List<ManufacturerInfo> manufacturerInfoAudit;
 	private List<SupplierInfo> supplierInfoAudit;
 	private List<Material> materialAudit;
+	private List<Inbound> inboundAudit;
+	private List<Outbound> outboundAudit;
 	// 工单
 	private List<WorkOrder> workOrderAudit;
 	// 生产信息发布