修改报废查询

hy-boot-module-activiti/src/main/java/org/hy/modules/process/controller/ProcessSmaterialsScrapController.java

@@ -31,6 +31,7 @@ import org.hy.modules.process.service.IProcessSmaterialsScrapService;
 import org.hy.modules.process.vo.ProcessSmaterialsScrapListVO;
 import org.hy.modules.process.vo.ProcessSmaterialsScrapPage;
 import org.hy.modules.util.BacthNumber;
+import org.hy.modules.wastematerials.entity.ProcessWasteMaterials;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -96,6 +97,21 @@ public class ProcessSmaterialsScrapController {
         return Result.OK(pageList);
     }
 
+    /**
+     * 通过id查询
+     *
+     * @param processWasteMateria
+     * @return
+     */
+    @AutoLog(value = "账外物资库-通过id查询")
+    @ApiOperation(value="账外物资库-通过id查询", notes="账外物资库-通过id查询")
+    @GetMapping(value = "/queryByIdOwn")
+    public Result<?> queryByIdOwn(ProcessWasteMaterials processWasteMateria) {
+        Result<?> result = processSmaterialsScrapService.getByIdOwn(processWasteMateria);
+
+        return result;
+    }
+
     /**
      * 添加
      *

hy-boot-module-activiti/src/main/java/org/hy/modules/process/dto/ProcessMaterialsDeliveryListDTO.java

@@ -31,6 +31,8 @@ public class ProcessMaterialsDeliveryListDTO implements Serializable {
 	private String id;
 	/**物料组*/
 	private String materialGroup;
+	/**部门*/
+	private String departId;
 	/**器材编号*/
 	@Excel(name = "器材编号", width = 15)
 	@ApiModelProperty(value = "器材编号")

hy-boot-module-activiti/src/main/java/org/hy/modules/process/mapper/ProcessMaterialsDeliveryListMapper.java

@@ -52,4 +52,6 @@ public interface ProcessMaterialsDeliveryListMapper extends BaseMapper<ProcessMa
 	 * @return
 	 */
 	SysDepartVo queryPageDepare(String id);
+
+	Integer getEquipment(@Param("par") ProcessMaterialsDeliveryListDTO p);
 }

hy-boot-module-activiti/src/main/java/org/hy/modules/process/mapper/ProcessSmaterialsScrapListMapper.java

@@ -20,4 +20,6 @@ public interface ProcessSmaterialsScrapListMapper extends BaseMapper<ProcessSmat
 	public List<ProcessSmaterialsScrapList> selectByMainId(@Param("mainId") String mainId);
 
     List<ProcessSmaterialsScrapListVO> selectByMainIdVO(String mainId);
+
+	Integer getEquipment(@Param("par") ProcessSmaterialsScrapList scrapList);
 }

hy-boot-module-activiti/src/main/java/org/hy/modules/process/mapper/xml/ProcessMaterialsDeliveryListMapper.xml

@@ -105,4 +105,12 @@
 		from sys_depart
 		where id = #{id}
 	</select>
+
+	<select id="getEquipment" parameterType="string" resultType="Integer">
+		select sum(pmdl.actual_send_number)
+		from process_materials_delivery_list pmdl  where pmdl.process_materials_delivery_id in (
+		    SELECT pmd.id
+		  FROM process_materials_delivery  pmd where pmd.depart_id = #{par.departId} and  pmd.act_status = '审批通过' and pmd.del_flag = 0 )
+		and pmdl.equipment = #{par.equipment}
+	</select>
 </mapper>

hy-boot-module-activiti/src/main/java/org/hy/modules/process/mapper/xml/ProcessSmaterialsScrapListMapper.xml

@@ -13,6 +13,13 @@
 		FROM  process_smaterials_scrap_list
 		WHERE
 			 process_smaterials_scrap_id = #{mainId} 	</select>
+	<select id="getEquipment" parameterType="java.lang.String" resultType="integer">
+		select sum(pssl.actual_number)
+		from process_smaterials_scrap_list pssl  where pssl.process_smaterials_scrap_id in (
+		    SELECT pss.id
+			FROM process_smaterials_scrap  pss where pss.depart_id = #{par.createBy}  and  pss.act_status = '审批通过' and pss.del_flag = 0 )
+		and pssl.equipment = #{par.equipment}
+	</select>
 
 	<select id="selectByMainIdVO"  resultType="org.hy.modules.process.vo.ProcessSmaterialsScrapListVO">
 

hy-boot-module-activiti/src/main/java/org/hy/modules/process/service/IProcessSmaterialsScrapService.java

@@ -1,8 +1,10 @@
 package org.hy.modules.process.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.hy.common.api.vo.Result;
 import org.hy.modules.process.entity.ProcessSmaterialsScrap;
 import org.hy.modules.process.entity.ProcessSmaterialsScrapList;
+import org.hy.modules.wastematerials.entity.ProcessWasteMaterials;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -39,5 +41,6 @@ public interface IProcessSmaterialsScrapService extends IService<ProcessSmateria
 	public void delBatchMain (Collection<? extends Serializable> idList);
 
 	ProcessSmaterialsScrap queryPlanById(String id);
-	
+
+	Result<?> getByIdOwn(ProcessWasteMaterials processWasteMateria);
 }

hy-boot-module-activiti/src/main/java/org/hy/modules/process/service/impl/ProcessSmaterialsScrapServiceImpl.java

@@ -1,14 +1,21 @@
 package org.hy.modules.process.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.hy.common.api.vo.Result;
+import org.hy.common.system.vo.SysDepartVo;
+import org.hy.modules.process.dto.ProcessMaterialsDeliveryListDTO;
 import org.hy.modules.process.entity.ProcessSmaterialsScrap;
 import org.hy.modules.process.entity.ProcessSmaterialsScrapList;
+import org.hy.modules.process.mapper.ProcessMaterialsDeliveryListMapper;
 import org.hy.modules.process.mapper.ProcessSmaterialsScrapListMapper;
 import org.hy.modules.process.mapper.ProcessSmaterialsScrapMapper;
 import org.hy.modules.process.service.IProcessMaterialsDeliveryListService;
 import org.hy.modules.process.service.IProcessMaterialsDeliveryService;
 import org.hy.modules.process.service.IProcessSmaterialsScrapListService;
 import org.hy.modules.process.service.IProcessSmaterialsScrapService;
+import org.hy.modules.wastematerials.entity.ProcessWasteMaterials;
+import org.hy.modules.wastematerials.service.IProcessWasteMaterialsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -32,16 +39,22 @@ public class ProcessSmaterialsScrapServiceImpl extends ServiceImpl<ProcessSmater
 	@Autowired
 	private ProcessSmaterialsScrapListMapper processSmaterialsScrapListMapper;
 
+	@Autowired
+	private IProcessWasteMaterialsService processWasteMaterialsService;
+
 	@Autowired
 	private IProcessSmaterialsScrapListService processSmaterialsScrapListService;
 
 	@Autowired
 	IProcessMaterialsDeliveryService processMaterialsDeliveryService;
+	@Autowired
+	ProcessMaterialsDeliveryListMapper processMaterialsDeliveryListMapper;
 
 	@Autowired
 	IProcessMaterialsDeliveryListService processMaterialsDeliveryListService;
 
 	List<ProcessSmaterialsScrapList> processSmaterialsScrapLists;
+
 	@Override
 	@Transactional
 	public boolean saveMain(ProcessSmaterialsScrap processSmaterialsScrap, List<ProcessSmaterialsScrapList> processSmaterialsScrapListList) {
@@ -135,4 +148,49 @@ public class ProcessSmaterialsScrapServiceImpl extends ServiceImpl<ProcessSmater
 		return processSmaterialsScrapMapper.queryPlanById(id);
 	}
 
+	@Override
+	public Result<?> getByIdOwn(ProcessWasteMaterials processWasteMateria) {
+		//查询报废数据
+		ProcessSmaterialsScrap processSmaterialsScrap = baseMapper.queryPlanById(processWasteMateria.getProcessId());
+		//查询部门信息
+		SysDepartVo sysDepartVo = processMaterialsDeliveryListMapper.queryPageDepare(processSmaterialsScrap.getDepartId());
+		switch (sysDepartVo.getOrgType()){
+			case "1":
+
+				return Result.OK(null);
+			case "2":
+				//项目部
+				ProcessWasteMaterials processWasteMaterials = processWasteMaterialsService.getById(processWasteMateria.getId());
+				if(processWasteMaterials==null) {
+					return Result.error("未找到对应数据");
+				}
+				return Result.OK(processWasteMaterials);
+			case "3":
+				//小队
+				ProcessMaterialsDeliveryListDTO p = new ProcessMaterialsDeliveryListDTO();
+				p.setEquipment(processWasteMateria.getMaterialNumber());
+				p.setDepartId(processSmaterialsScrap.getDepartId());
+				Integer equipment = processMaterialsDeliveryListMapper.getEquipment(p);//全部数量
+				ProcessSmaterialsScrapList scrapList = new ProcessSmaterialsScrapList();
+				scrapList.setEquipment(processWasteMateria.getMaterialNumber());
+				scrapList.setCreateBy(processSmaterialsScrap.getDepartId());
+				Integer equipment1 = processSmaterialsScrapListMapper.getEquipment(scrapList); // 报废数量
+				ProcessWasteMaterials processWaste = processWasteMaterialsService.getById(processWasteMateria.getId());
+				if(processWaste==null) {
+					return Result.error("未找到对应数据");
+				}
+				if(ObjectUtils.isNotNull(equipment)){
+					if(ObjectUtils.isNotNull(equipment1)){
+						processWaste.setMaterialQuantity(equipment-equipment1);
+					}else{
+						processWaste.setMaterialQuantity(equipment);
+					}
+				}else{
+					processWaste.setMaterialQuantity(0);
+				}
+				return Result.OK(processWaste);
+		}
+		return null;
+	}
+
 }