Merge remote-tracking branch 'origin/main'

src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java

@@ -35,9 +35,12 @@ import com.dayu.daf.core.tool.api.R;
 import com.dayu.daf.core.tool.utils.Func;
 import lombok.SneakyThrows;
 import org.apache.commons.codec.Charsets;
+import org.energy.modules.inspection.entity.InspectionRoute;
+import org.energy.modules.inspection.excel.InspectionRouteExcel;
 import org.energy.modules.inspection.excel.InspectionTasksExcel;
 import org.energy.modules.leger.entity.EquipmentLedger;
 import org.energy.modules.leger.excel.EquipmentLedgerExcel;
+import org.energy.modules.system.util.DataUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -228,15 +231,15 @@ public class InspectionTasksController extends DafController {
 	@ApiOperation(value = "导出", notes = "传入")
 	@ApiLog
 	public void exportUser(@ApiIgnore @RequestParam Map<String, Object> entity, HttpServletResponse response) {
-		if (entity.containsKey("station_equal")) {
-			entity.put("station_equal", Integer.parseInt((String) entity.get("station_equal")));
-		}
-		if (entity.containsKey("taskStatus_equal")) {
-			entity.put("taskStatus_equal", Integer.parseInt((String) entity.get("taskStatus_equal")));
-		}
-		QueryWrapper<InspectionTasks> queryWrapper = Condition.getQueryWrapper(entity, InspectionTasks.class);
-		queryWrapper.lambda().eq(InspectionTasks::getIsDeleted, DafConstant.DB_NOT_DELETED);
-		List<InspectionTasksExcel> list = inspectionTasksService.export(queryWrapper);
+		entity.remove("daf-auth");
+		entity.forEach((key, value) -> {
+			if (!"station".equals(key) && !"taskStatus".equals(key))
+			{
+				entity.put(key, "%" + value + "%");
+			}
+		});
+		InspectionTasks vo = DataUtils.mapToEntity(entity, InspectionTasks::new);
+		List<InspectionTasksExcel> list = inspectionTasksService.export(vo);
 		response.setContentType("application/vnd.ms-excel");
 		response.setCharacterEncoding(Charsets.UTF_8.name());
 		String fileName = URLEncoder.encode("巡检任务数据导出", Charsets.UTF_8.name());

src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.java

@@ -32,7 +32,7 @@ public interface InspectionTasksMapper extends BaseMapper<InspectionTasks> {
 	/**
 	 * 导出
 	 */
-	List<InspectionTasksExcel> exportData(@Param("ew") Wrapper<InspectionTasks> queryWrapper);
+	List<InspectionTasksExcel> exportData(@Param("entity") InspectionTasks inspectionTasks);
 
 	/**
 	 * 获取最大任务编号

src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml

@@ -36,25 +36,34 @@
     </select>
 
     <select id="exportData" resultType="org.energy.modules.inspection.excel.InspectionTasksExcel">
-        SELECT task_no
-               ,task_name
-               ,CASE
-                   WHEN station = '1' THEN '景和光伏'
-                   WHEN station = '2' THEN '北沙一光伏'
-                   WHEN station = '3' THEN '北沙二光伏'
-                   WHEN station = '4' THEN '达坂城风电一场'
-                   ELSE ''
-                   END AS station_ext
-               ,task_start_date
-               ,task_end_date
-               ,responsible_person
-               ,CASE
-                   WHEN task_status = '1' THEN '已启动'
-                   WHEN task_status = '2' THEN '已停止'
-                   ELSE ''
-                   END AS task_status_ext
-               , cancel_reason
-        FROM i_inspection_tasks ${ew.customSqlSegment}
+        SELECT a.task_no, a.task_name, dic1.dict_value AS stationExt, a.task_start_date
+            , a.task_end_date, a.responsible_person, dic2.dict_value AS taskStatusExt
+            , a.cancel_reason
+        FROM i_inspection_tasks a
+        LEFT JOIN sys_dict dic1 ON dic1.code = 'station' AND dic1.dict_key = a.station AND dic1.is_deleted = '0'
+        LEFT JOIN sys_dict dic2 ON dic2.code = 'task_status' AND dic2.dict_key = a.task_status AND dic2.is_deleted = '0'
+        WHERE a.is_deleted = 0
+        <if test="entity.taskNo != null and entity.taskNo != ''">
+            AND a.task_no LIKE #{entity.taskNo}
+        </if>
+        <if test="entity.taskName != null and entity.taskName != ''">
+            AND a.task_name LIKE #{entity.taskName}
+        </if>
+        <if test="entity.station != null and entity.station != ''">
+            AND a.station = #{entity.station}
+        </if>
+        <if test="entity.taskStartDate != null and entity.taskStartDate != ''">
+            AND a.task_start_date LIKE #{entity.taskStartDate}
+        </if>
+        <if test="entity.taskEndDate != null and entity.taskEndDate != ''">
+            AND a.task_end_date LIKE #{entity.taskEndDate}
+        </if>
+        <if test="entity.responsiblePerson != null and entity.responsiblePerson != ''">
+            AND a.responsible_person LIKE #{entity.responsiblePerson}
+        </if>
+        <if test="entity.taskStatus != null and entity.taskStatus != ''">
+            AND a.task_status = #{entity.taskStatus}
+        </if>
     </select>
 
     <select id="getMaxTaskNO" resultType="java.lang.String">

src/main/java/org/energy/modules/inspection/service/IInspectionTasksService.java

@@ -1,7 +1,9 @@
 package org.energy.modules.inspection.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import org.energy.modules.inspection.entity.InspectionRoute;
 import org.energy.modules.inspection.entity.InspectionTasks;
+import org.energy.modules.inspection.excel.InspectionRouteExcel;
 import org.energy.modules.inspection.excel.InspectionTasksExcel;
 import org.energy.modules.inspection.vo.InspectionTasksVO;
 import com.dayu.daf.core.mp.base.BaseService;
@@ -30,11 +32,8 @@ public interface IInspectionTasksService extends BaseService<InspectionTasks> {
 
 	/**
 	 * 获取导出数据
-	 *
-	 * @param queryWrapper
-	 * @return
 	 */
-	List<InspectionTasksExcel> export(Wrapper<InspectionTasks> queryWrapper);
+	List<InspectionTasksExcel> export(InspectionTasks InspectionTasks);
 
 	/**
 	 * 获取最大任务编号

src/main/java/org/energy/modules/inspection/service/impl/InspectionTasksServiceImpl.java

@@ -29,8 +29,8 @@ public class InspectionTasksServiceImpl extends BaseServiceImpl<InspectionTasksM
 	}
 
 	@Override
-	public List<InspectionTasksExcel> export(Wrapper<InspectionTasks> queryWrapper) {
-		List<InspectionTasksExcel> list = baseMapper.exportData(queryWrapper);
+	public List<InspectionTasksExcel> export(InspectionTasks inspectionTasks) {
+		List<InspectionTasksExcel> list = baseMapper.exportData(inspectionTasks);
 		return list;
 	}
 

src/main/java/org/energy/modules/spares/controller/InboundController.java

@@ -29,6 +29,7 @@ import com.dayu.daf.core.tool.api.R;
 import com.dayu.daf.core.tool.utils.Func;
 import lombok.Data;
 import org.energy.modules.leger.entity.TechParameters;
+import org.energy.modules.spares.service.IMaterialService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -54,6 +55,7 @@ import java.util.List;
 public class InboundController extends DafController {
 
 	private IInboundService inboundService;
+	private IMaterialService materialService;
 
 	/**
 	 * 详情
@@ -105,6 +107,10 @@ public class InboundController extends DafController {
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入inbound")
 	public R update(@Valid @RequestBody Inbound inbound) {
+		if (inbound.getIstatus() == 2)
+		{
+			materialService.updateNum(inbound.getMaterialNo(), inbound.getInboundCount());
+		}
 		return R.status(inboundService.updateById(inbound));
 	}
 

src/main/java/org/energy/modules/spares/controller/ManufacturerInfoController.java

@@ -201,4 +201,26 @@ public class ManufacturerInfoController extends DafController {
 		EasyExcel.write(response.getOutputStream(), ManufacturerInfoExcel.class).sheet("制造商信息管理").doWrite(list);
 	}
 
+	/**
+	 * 获取制造商
+	 */
+	@GetMapping("/getNoList")
+	@ApiOperationSupport(order = 11)
+	@ApiOperation(value = "获取编号", notes = "获取编号")
+	public R<List<ManufacturerInfo>> getNoList() {
+		List<ManufacturerInfo> noList = manufacturerInfoService.getNoList();
+		return R.data(noList);
+	}
+
+	/**
+	 * 获取制造商信息
+	 */
+	@GetMapping("/getDetail")
+	@ApiOperationSupport(order = 12)
+	@ApiOperation(value = "获取制造商信息", notes = "获取制造商信息")
+	public R<ManufacturerInfo> getDetail(String creditCode) {
+		ManufacturerInfo detail = manufacturerInfoService.getDetail(creditCode);
+		return R.data(detail);
+	}
+
 }

src/main/java/org/energy/modules/spares/controller/MaterialClassCodeController.java

@@ -34,6 +34,8 @@ import org.energy.modules.spares.vo.MaterialClassCodeVO;
 import org.energy.modules.spares.service.IMaterialClassCodeService;
 import com.dayu.daf.core.boot.ctrl.DafController;
 
+import java.util.List;
+
 /**
  * 物资分类码 控制器
  *
@@ -122,5 +124,16 @@ public class MaterialClassCodeController extends DafController {
 		return R.status(materialClassCodeService.deleteLogic(Func.toLongList(ids)));
 	}
 
+	/**
+	 * 分页 物资分类码
+	 */
+	@GetMapping("/getMaterialClassCodeList")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "获取物资分类码", notes = "获取物资分类码")
+	public R<List<String>> getMaterialClassCodeList() {
+		List<String> list = materialClassCodeService.getMaterialClassCodeList();
+		return R.data(list);
+	}
+
 
 }

src/main/java/org/energy/modules/spares/controller/MaterialController.java

@@ -38,6 +38,7 @@ import org.apache.commons.codec.Charsets;
 import org.energy.modules.inspection.entity.InspectionRoute;
 import org.energy.modules.inspection.excel.InspectionRouteExcel;
 import org.energy.modules.spares.excel.MaterialExcel;
+import org.energy.modules.system.util.DataUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -195,8 +196,8 @@ public class MaterialController extends DafController {
 	@GetMapping("/getDetailList")
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "获取物资信息", notes = "获取物资信息")
-	public R<Material> getDetailList(String materialNo) {
-		Material DetailList = materialService.getDetailList("'" + materialNo + "'");
+	public R<MaterialVO> getDetailList(String materialNo) {
+		MaterialVO DetailList = materialService.getDetailList(materialNo);
 		return R.data(DetailList);
 	}
 
@@ -209,15 +210,15 @@ public class MaterialController extends DafController {
 	@ApiOperation(value = "导出", notes = "传入")
 	@ApiLog
 	public void exportMaterial(@ApiIgnore @RequestParam Map<String, Object> entity, HttpServletResponse response) {
-		if (entity.containsKey("station_equal")) {
-			entity.put("station_equal", Integer.parseInt((String) entity.get("station_equal")));
-		}
-
-		QueryWrapper<Material> queryWrapper = Condition.getQueryWrapper(entity, Material.class);
-		queryWrapper.lambda().eq(Material::getIsDeleted, DafConstant.DB_NOT_DELETED);
-		queryWrapper.orderByAsc("material_no");
-
-		List<MaterialExcel> list = materialService.exportData(queryWrapper);
+		entity.remove("daf-auth");
+		entity.forEach((key, value) -> {
+			if (!"station".equals(key))
+			{
+				entity.put(key, "%" + value + "%");
+			}
+		});
+		Material vo = DataUtils.mapToEntity(entity, Material::new);
+		List<MaterialExcel> list = materialService.exportData(vo);
 		response.setContentType("application/vnd.ms-excel");
 		response.setCharacterEncoding(Charsets.UTF_8.name());
 		String fileName = URLEncoder.encode("物资数据导出", Charsets.UTF_8.name());

src/main/java/org/energy/modules/spares/controller/OutboundController.java

@@ -15,6 +15,7 @@
  */
 package org.energy.modules.spares.controller;
 
+import com.xkcoding.http.util.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -26,7 +27,7 @@ import com.dayu.daf.core.mp.support.Condition;
 import com.dayu.daf.core.mp.support.Query;
 import com.dayu.daf.core.tool.api.R;
 import com.dayu.daf.core.tool.utils.Func;
-import org.energy.modules.spares.entity.Inbound;
+import org.energy.modules.spares.service.IMaterialService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -35,6 +36,8 @@ import org.energy.modules.spares.vo.OutboundVO;
 import org.energy.modules.spares.service.IOutboundService;
 import com.dayu.daf.core.boot.ctrl.DafController;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -50,6 +53,7 @@ import java.util.List;
 public class OutboundController extends DafController {
 
 	private IOutboundService outboundService;
+	private IMaterialService materialService;
 
 	/**
 	 * 详情
@@ -101,6 +105,10 @@ public class OutboundController extends DafController {
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入outbound")
 	public R update(@Valid @RequestBody Outbound outbound) {
+		if (outbound.getIstatus() == 2)
+		{
+			materialService.updateNum(outbound.getMaterialNo(), Math.negateExact(outbound.getOutboundCount()));
+		}
 		return R.status(outboundService.updateById(outbound));
 	}
 
@@ -111,6 +119,22 @@ public class OutboundController extends DafController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入outbound")
 	public R submit(@Valid @RequestBody Outbound outbound) {
+		String maxNo = outboundService.getMaxNo("'%" + outbound.getMaterialNo() + "%'");
+		int number;
+		if (StringUtil.isNotEmpty(maxNo)){
+			number = Integer.parseInt(maxNo.substring(11));
+			number++;
+		}else{
+			number = 1;
+		}
+		String numFormat = String.format("%06d", number);
+		String no = outbound.getMaterialNo() + "OUT" + numFormat;
+		outbound.setOutboundNo(no);
+		Date date = new Date();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+		String time = sdf.format(date);
+		outbound.setOutboundTime(time);
+		outbound.setIstatus(1L);
 		return R.status(outboundService.saveOrUpdate(outbound));
 	}
 

src/main/java/org/energy/modules/spares/controller/SupplierInfoController.java

@@ -201,5 +201,27 @@ public class SupplierInfoController extends DafController {
 		EasyExcel.write(response.getOutputStream(), SupplierInfoExcel.class).sheet("供应商信息管理").doWrite(list);
 	}
 
+	/**
+	 * 获取供应商
+	 */
+	@GetMapping("/getNoList")
+	@ApiOperationSupport(order = 11)
+	@ApiOperation(value = "获取编号", notes = "获取编号")
+	public R<List<SupplierInfo>> getNoList() {
+		List<SupplierInfo> noList = supplierInfoService.getNoList();
+		return R.data(noList);
+	}
+
+	/**
+	 * 获取供应商信息
+	 */
+	@GetMapping("/getDetail")
+	@ApiOperationSupport(order = 12)
+	@ApiOperation(value = "获取供应商信息", notes = "获取供应商信息")
+	public R<SupplierInfo> getDetail(String creditCode) {
+		SupplierInfo detail = supplierInfoService.getDetail(creditCode);
+		return R.data(detail);
+	}
+
 
 }

src/main/java/org/energy/modules/spares/controller/WarehouseController.java

@@ -35,7 +35,6 @@ import com.dayu.daf.core.tool.api.R;
 import com.dayu.daf.core.tool.utils.Func;
 import lombok.SneakyThrows;
 import org.apache.commons.codec.Charsets;
-import org.energy.modules.spares.entity.ManufacturerInfo;
 import org.energy.modules.spares.excel.WarehouseExcel;
 import org.energy.modules.system.util.DataUtils;
 import org.springframework.web.bind.annotation.*;
@@ -208,4 +207,15 @@ public class WarehouseController extends DafController {
 		EasyExcel.write(response.getOutputStream(), WarehouseExcel.class).sheet("仓库").doWrite(list);
 	}
 
+	/**
+	 * 获取仓库信息
+	 */
+	@GetMapping("/getWarehouseList")
+	@ApiOperationSupport(order = 11)
+	@ApiOperation(value = "获取仓库信息", notes = "获取仓库信息")
+	public R<List<Warehouse>> getWarehouseList() {
+		List<Warehouse> noList = warehouseService.getWarehouseList();
+		return R.data(noList);
+	}
+
 }

src/main/java/org/energy/modules/spares/entity/Inbound.java

@@ -3,6 +3,9 @@ package org.energy.modules.spares.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dayu.daf.core.mp.base.BaseEntity;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
@@ -25,6 +28,7 @@ public class Inbound extends BaseEntity {
     /**
      * 主键
      */
+	@JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "主键")
     private Long id;
     /**

src/main/java/org/energy/modules/spares/entity/Material.java

@@ -60,7 +60,7 @@ public class Material extends BaseEntity {
      * 供应商名称
      */
     @ApiModelProperty(value = "供应商名称")
-    private String sipplierName;
+    private String supplierName;
     /**
      * 所属仓库
      */

src/main/java/org/energy/modules/spares/entity/Outbound.java

@@ -3,6 +3,9 @@ package org.energy.modules.spares.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dayu.daf.core.mp.base.BaseEntity;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
@@ -25,6 +28,7 @@ public class Outbound extends BaseEntity {
     /**
      * 主键
      */
+	@JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "主键")
     private Long id;
     /**

src/main/java/org/energy/modules/spares/mapper/ManufacturerInfoMapper.java

@@ -27,4 +27,8 @@ public interface ManufacturerInfoMapper extends BaseMapper<ManufacturerInfo> {
 	List<ManufacturerInfoVO> selectManufacturerInfoPage(IPage page, ManufacturerInfoVO manufacturerInfo);
 
 	List<ManufacturerInfoExcel> exportData(@Param("vo") ManufacturerInfoVO manufacturerInfo);
+
+	List<ManufacturerInfo> getNoList();
+
+	ManufacturerInfo getDetail(String creditCode);
 }

src/main/java/org/energy/modules/spares/mapper/ManufacturerInfoMapper.xml

@@ -48,4 +48,12 @@
         order by a.update_time desc
     </select>
 
+    <select id="getNoList" resultMap="manufacturerInfoResultMap">
+        select credit_code from spt_manufacturer_info where is_deleted = 0
+    </select>
+
+    <select id="getDetail" resultMap="manufacturerInfoResultMap">
+        select manufacturer_name from spt_manufacturer_info where credit_code = #{credit_code}
+    </select>
+
 </mapper>

src/main/java/org/energy/modules/spares/mapper/MaterialClassCodeMapper.java

@@ -23,4 +23,9 @@ public interface MaterialClassCodeMapper extends BaseMapper<MaterialClassCode> {
 	 */
 	List<MaterialClassCodeVO> selectMaterialClassCodePage(IPage page, MaterialClassCodeVO materialClassCode);
 
+	/**
+	 * 获取物资分类码
+	 */
+	List<String> getMaterialClassCodeList();
+
 }

src/main/java/org/energy/modules/spares/mapper/MaterialClassCodeMapper.xml

@@ -20,4 +20,8 @@
         select * from s_material_class_code where is_deleted = 0
     </select>
 
+    <select id="getMaterialClassCodeList" resultType="java.lang.String">
+        select material_class_code from s_material_class_code where is_deleted = 0
+    </select>
+
 </mapper>

src/main/java/org/energy/modules/spares/mapper/MaterialMapper.java

@@ -33,7 +33,7 @@ public interface MaterialMapper extends BaseMapper<Material> {
 	/**
 	 * 导出
 	 */
-	List<MaterialExcel> exportData(@Param("ew") Wrapper<Material> queryWrapper);
+	List<MaterialExcel> exportData(@Param("entity") Material material);
 
 	/**
 	 * 获取物资编号
@@ -48,6 +48,6 @@ public interface MaterialMapper extends BaseMapper<Material> {
 	/**
 	 * 获取物资的信息
 	 */
-	Material getDetailList(String materialNo);
+	MaterialVO getDetailList(String materialNo);
 
 }

src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml

@@ -16,7 +16,7 @@
         <result column="material_class_code" property="materialClassCode"/>
         <result column="model" property="model"/>
         <result column="manufacturer_name" property="manufacturerName"/>
-        <result column="sipplier_name" property="sipplierName"/>
+        <result column="supplier_name" property="supplierName"/>
         <result column="warehouse" property="warehouse"/>
         <result column="inventory_count" property="inventoryCount"/>
         <result column="material_description" property="materialDescription"/>
@@ -37,31 +37,42 @@
         select material_no from s_material where is_deleted = 0
     </select>
 
-    <select id="getDetailList" resultMap="materialResultMap">
+    <select id="getDetailList" resultType="org.energy.modules.spares.vo.MaterialVO">
         select material_name, model
---              ,b.warehouse_name
+             ,b.name as warehouse_name
+             ,inventory_count
         from s_material
---         inner join (
---             select warehouse_name
---             ,warehouse
---             from warehouse
---             where warehouse in (select warehouse from s_material where material_no = ${materialNo} and is_deleted = 0)
---         ) as b
---         on b.warehouse = s_material.warehouse
-        where material_no = ${materialNo} and is_deleted = 0
+        inner join (
+            select code
+            ,name
+            from spt_warehouse
+            where code in (select warehouse from s_material where material_no = #{materialNo} and is_deleted = 0)
+        ) as b
+        on b.code = s_material.warehouse
+        where material_no = #{materialNo} and is_deleted = 0
     </select>
 
     <select id="exportData" resultType="org.energy.modules.spares.excel.MaterialExcel">
-        SELECT material_no
-             ,CASE
-                  WHEN station = '1' THEN '景和光伏'
-                  WHEN station = '2' THEN '北沙一光伏'
-                  WHEN station = '3' THEN '北沙二光伏'
-                  WHEN station = '4' THEN '达坂城风电一场'
-                  ELSE ''
-            END AS station_ext
-             ,material_name, model, inventory_count, material_description
-        FROM s_material ${ew.customSqlSegment}
+            SELECT material_no, dic1.dict_value AS stationExt, material_name
+                , model, inventory_count, material_description
+            FROM s_material a
+                     LEFT JOIN sys_dict dic1 ON dic1.code = 'station' AND dic1.dict_key = a.station AND dic1.is_deleted = '0'
+            WHERE a.is_deleted = 0
+        <if test="entity.materialNo != null and entity.materialNo != ''">
+            AND a.material_no LIKE #{entity.materialNo}
+        </if>
+        <if test="entity.station != null and entity.station != ''">
+            AND a.station = #{entity.station}
+        </if>
+        <if test="entity.materialName != null and entity.materialName != ''">
+            AND a.material_name LIKE #{entity.materialName}
+        </if>
+        <if test="entity.model != null and entity.model != ''">
+            AND a.model LIKE #{entity.model}
+        </if>
+        <if test="entity.inventoryCount != null and entity.inventoryCount != ''">
+            AND a.inventory_count LIKE #{entity.inventoryCount}
+        </if>
     </select>
 
 </mapper>

src/main/java/org/energy/modules/spares/mapper/OutboundMapper.java

@@ -23,4 +23,9 @@ public interface OutboundMapper extends BaseMapper<Outbound> {
 	 */
 	List<OutboundVO> selectOutboundPage(IPage page, OutboundVO outbound);
 
+	/**
+	 * 获取最大编号
+	 */
+	String getMaxNo(String materialNo);
+
 }

src/main/java/org/energy/modules/spares/mapper/OutboundMapper.xml

@@ -25,4 +25,8 @@
         select * from s_outbound where is_deleted = 0
     </select>
 
+    <select id="getMaxNo" resultType="java.lang.String">
+        select max(outbound_no) from s_outbound where is_deleted = 0 and outbound_no like ${materialNo}
+    </select>
+
 </mapper>

src/main/java/org/energy/modules/spares/mapper/SupplierInfoMapper.java

@@ -28,4 +28,7 @@ public interface SupplierInfoMapper extends BaseMapper<SupplierInfo> {
 
 	List<SupplierInfoExcel> exportData(@Param("vo") SupplierInfoVO supplierInfo);
 
+	List<SupplierInfo> getNoList();
+
+	SupplierInfo getDetail(String creditCode);
 }

src/main/java/org/energy/modules/spares/mapper/SupplierInfoMapper.xml

@@ -51,4 +51,12 @@
         order by a.update_time desc
     </select>
 
+    <select id="getNoList" resultMap="supplierInfoResultMap">
+        select credit_code from spt_supplier_info where is_deleted = 0
+    </select>
+
+    <select id="getDetail" resultMap="supplierInfoResultMap">
+        select supplier_name from spt_supplier_info where credit_code = #{credit_code}
+    </select>
+
 </mapper>

src/main/java/org/energy/modules/spares/mapper/WarehouseMapper.java

@@ -27,4 +27,6 @@ public interface WarehouseMapper extends BaseMapper<Warehouse> {
 
 	List<WarehouseExcel> exportData(@Param("vo") WarehouseVO warehouseVO);
 
+	List<Warehouse> getWarehouseList();
+
 }

src/main/java/org/energy/modules/spares/mapper/WarehouseMapper.xml

@@ -53,4 +53,8 @@
         order by a.update_time desc
     </select>
 
+    <select id="getWarehouseList" resultMap="warehouseResultMap">
+        select id, code, name from spt_warehouse where is_deleted = 0
+    </select>
+
 </mapper>

src/main/java/org/energy/modules/spares/service/IManufacturerInfoService.java

@@ -26,4 +26,14 @@ public interface IManufacturerInfoService extends BaseService<ManufacturerInfo>
 	IPage<ManufacturerInfoVO> selectManufacturerInfoPage(IPage<ManufacturerInfoVO> page, ManufacturerInfoVO manufacturerInfo);
 
 	List<ManufacturerInfoExcel> export(ManufacturerInfoVO manufacturerInfoVO);
+
+	/**
+	 * 获取制造商
+	 */
+	List<ManufacturerInfo> getNoList();
+
+	/**
+	 * 获取制造商信息
+	 */
+	ManufacturerInfo getDetail(String creditCode);
 }

src/main/java/org/energy/modules/spares/service/IMaterialClassCodeService.java

@@ -5,6 +5,8 @@ import org.energy.modules.spares.vo.MaterialClassCodeVO;
 import com.dayu.daf.core.mp.base.BaseService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.util.List;
+
 /**
  * 物资分类码 服务类
  *
@@ -22,4 +24,9 @@ public interface IMaterialClassCodeService extends BaseService<MaterialClassCode
 	 */
 	IPage<MaterialClassCodeVO> selectMaterialClassCodePage(IPage<MaterialClassCodeVO> page, MaterialClassCodeVO materialClassCode);
 
+	/**
+	 * 获取物资分类码
+	 */
+	List<String> getMaterialClassCodeList();
+
 }

src/main/java/org/energy/modules/spares/service/IMaterialService.java

@@ -30,7 +30,7 @@ public interface IMaterialService extends BaseService<Material> {
 	/**
 	 * 导出
 	 */
-	List<MaterialExcel> exportData(Wrapper<Material> queryWrapper);
+	List<MaterialExcel> exportData(Material material);
 
 	/**
 	 * 获取物资编号
@@ -45,6 +45,8 @@ public interface IMaterialService extends BaseService<Material> {
 	/**
 	 * 获取物资的信息
 	 */
-	Material getDetailList(String materialNo);
+	MaterialVO getDetailList(String materialNo);
+
+	void updateNum(String materialNo, long num);
 
 }

src/main/java/org/energy/modules/spares/service/IOutboundService.java

@@ -22,4 +22,9 @@ public interface IOutboundService extends BaseService<Outbound> {
 	 */
 	IPage<OutboundVO> selectOutboundPage(IPage<OutboundVO> page, OutboundVO outbound);
 
+	/**
+	 * 获取最大编号
+	 */
+	String getMaxNo(String materialNo);
+
 }

src/main/java/org/energy/modules/spares/service/ISupplierInfoService.java

@@ -26,4 +26,14 @@ public interface ISupplierInfoService extends BaseService<SupplierInfo> {
 	IPage<SupplierInfoVO> selectSupplierInfoPage(IPage<SupplierInfoVO> page, SupplierInfoVO supplierInfo);
 
 	List<SupplierInfoExcel> export(SupplierInfoVO supplierInfo);
+
+	/**
+	 * 获取制造商
+	 */
+	List<SupplierInfo> getNoList();
+
+	/**
+	 * 获取制造商信息
+	 */
+	SupplierInfo getDetail(String creditCode);
 }

src/main/java/org/energy/modules/spares/service/IWarehouseService.java

@@ -27,4 +27,6 @@ public interface IWarehouseService extends BaseService<Warehouse> {
 
 	List<WarehouseExcel> export(WarehouseVO warehouseVO);
 
+	List<Warehouse> getWarehouseList();
+
 }

src/main/java/org/energy/modules/spares/service/impl/ManufacturerInfoServiceImpl.java

@@ -3,7 +3,6 @@ package org.energy.modules.spares.service.impl;
 import io.micrometer.core.instrument.util.StringUtils;
 import org.energy.modules.spares.entity.ManufacturerInfo;
 import org.energy.modules.spares.excel.ManufacturerInfoExcel;
-import org.energy.modules.spares.excel.MaterialClassExcel;
 import org.energy.modules.spares.vo.ManufacturerInfoVO;
 import org.energy.modules.spares.mapper.ManufacturerInfoMapper;
 import org.energy.modules.spares.service.IManufacturerInfoService;
@@ -42,4 +41,16 @@ public class ManufacturerInfoServiceImpl extends BaseServiceImpl<ManufacturerInf
 		return list;
 	}
 
+	@Override
+	public List<ManufacturerInfo> getNoList() {
+		List<ManufacturerInfo> list = baseMapper.getNoList();
+		return list;
+	}
+
+	@Override
+	public ManufacturerInfo getDetail(String creditCode) {
+		ManufacturerInfo detail = baseMapper.getDetail(creditCode);
+		return detail;
+	}
+
 }

src/main/java/org/energy/modules/spares/service/impl/MaterialClassCodeServiceImpl.java

@@ -8,6 +8,8 @@ import com.dayu.daf.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.util.List;
+
 /**
  * 物资分类码 服务实现类
  *
@@ -22,4 +24,12 @@ public class MaterialClassCodeServiceImpl extends BaseServiceImpl<MaterialClassC
 		return page.setRecords(baseMapper.selectMaterialClassCodePage(page, materialClassCode));
 	}
 
+	/**
+	 * 获取物资分类码
+	 */
+	@Override
+	public List<String> getMaterialClassCodeList() {
+		return baseMapper.getMaterialClassCodeList();
+	}
+
 }

src/main/java/org/energy/modules/spares/service/impl/MaterialServiceImpl.java

@@ -1,6 +1,7 @@
 package org.energy.modules.spares.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.dayu.daf.core.mp.support.Condition;
 import org.energy.modules.inspection.entity.InspectionRoute;
 import org.energy.modules.inspection.excel.InspectionRouteExcel;
 import org.energy.modules.spares.entity.Material;
@@ -29,8 +30,8 @@ public class MaterialServiceImpl extends BaseServiceImpl<MaterialMapper, Materia
 	}
 
 	@Override
-	public List<MaterialExcel> exportData(Wrapper<Material> queryWrapper) {
-		List<MaterialExcel> list = baseMapper.exportData(queryWrapper);
+	public List<MaterialExcel> exportData(Material material) {
+		List<MaterialExcel> list = baseMapper.exportData(material);
 		return list;
 	}
 
@@ -47,9 +48,18 @@ public class MaterialServiceImpl extends BaseServiceImpl<MaterialMapper, Materia
 	}
 
 	@Override
-	public Material getDetailList(String materialNo) {
-		Material DetailList = baseMapper.getDetailList(materialNo);
+	public MaterialVO getDetailList(String materialNo) {
+		MaterialVO DetailList = baseMapper.getDetailList(materialNo);
 		return DetailList;
 	}
 
+	@Override
+	public void updateNum(String materialNo, long num) {
+		Material sel = new Material();
+		sel.setMaterialNo(materialNo);
+		Material entity = getOne(Condition.getQueryWrapper(sel));
+		entity.setInventoryCount(entity.getInventoryCount() + num);
+		updateById(entity);
+	}
+
 }

src/main/java/org/energy/modules/spares/service/impl/OutboundServiceImpl.java

@@ -22,4 +22,10 @@ public class OutboundServiceImpl extends BaseServiceImpl<OutboundMapper, Outboun
 		return page.setRecords(baseMapper.selectOutboundPage(page, outbound));
 	}
 
+	@Override
+	public String getMaxNo(String materialNo){
+		String maxNo = baseMapper.getMaxNo(materialNo);
+		return maxNo;
+	}
+
 }

src/main/java/org/energy/modules/spares/service/impl/SupplierInfoServiceImpl.java

@@ -41,4 +41,16 @@ public class SupplierInfoServiceImpl extends BaseServiceImpl<SupplierInfoMapper,
 		return list;
 	}
 
+	@Override
+	public List<SupplierInfo> getNoList() {
+		List<SupplierInfo> list = baseMapper.getNoList();
+		return list;
+	}
+
+	@Override
+	public SupplierInfo getDetail(String creditCode) {
+		SupplierInfo detail = baseMapper.getDetail(creditCode);
+		return detail;
+	}
+
 }

src/main/java/org/energy/modules/spares/service/impl/WarehouseServiceImpl.java

@@ -42,4 +42,9 @@ public class WarehouseServiceImpl extends BaseServiceImpl<WarehouseMapper, Wareh
 		return list;
 	}
 
+	@Override
+	public List<Warehouse> getWarehouseList() {
+		List<Warehouse> list = baseMapper.getWarehouseList();
+		return list;
+	}
 }

src/main/java/org/energy/modules/spares/vo/MaterialVO.java

@@ -17,14 +17,8 @@ import io.swagger.annotations.ApiModel;
 public class MaterialVO extends Material {
 	private static final long serialVersionUID = 1L;
 
-	// 物资名称
-	private static final String materialName = "";
-
-	// 规格模型
-	private static final String model = "";
-
 	// 仓库名
-	private static final String warehouseName = "";
+	private String warehouseName;