物资详细画面处理

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/OutboundController.java

@@ -27,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;
@@ -53,6 +53,7 @@ import java.util.List;
 public class OutboundController extends DafController {
 
 	private IOutboundService outboundService;
+	private IMaterialService materialService;
 
 	/**
 	 * 详情
@@ -104,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));
 	}
 

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/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/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

@@ -47,4 +47,6 @@ public interface IMaterialService extends BaseService<Material> {
 	 */
 	MaterialVO getDetailList(String materialNo);
 
+	void updateNum(String materialNo, long num);
+
 }

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;
@@ -52,4 +53,13 @@ public class MaterialServiceImpl extends BaseServiceImpl<MaterialMapper, Materia
 		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/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;
+	}
 }