diff --git a/src/main/java/com/nov/KgLowDurable/controller/LdDemandEndController.java b/src/main/java/com/nov/KgLowDurable/controller/LdDemandEndController.java index e6cfb7d..d3e8dc3 100644 --- a/src/main/java/com/nov/KgLowDurable/controller/LdDemandEndController.java +++ b/src/main/java/com/nov/KgLowDurable/controller/LdDemandEndController.java @@ -9,6 +9,7 @@ import com.nov.KgLowDurable.service.ILdDemandEndService; import com.nov.KgLowDurable.util.Result; import io.swagger.annotations.*; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -20,6 +21,7 @@ import java.util.Map; /** * @author liweidong */ +@Slf4j @RestController @AllArgsConstructor @RequestMapping("/demandEnd") @@ -37,10 +39,15 @@ public class LdDemandEndController { }) public Result list(@ApiParam(hidden = true) @RequestParam(required = false) String demandNo, + @RequestParam(required = false) String materialName, + @RequestParam(required = false) String model, + @RequestParam(required = false) String department, + @RequestParam(required = false) String year, + @RequestParam(required = false) String quarter, @RequestParam(required = false ,defaultValue = "1") Integer pageNum, @RequestParam(required = false ,defaultValue = "10") Integer pageSize) { - return Result.OK(demandEndService.getDemandEndList(demandNo,pageNum,pageSize)); + return Result.OK(demandEndService.getDemandEndList(demandNo,materialName,model,department,year,quarter,pageNum,pageSize)); } @@ -82,12 +89,8 @@ public class LdDemandEndController { @ApiImplicitParam(name = "optionType", value = "选项", dataType = "string", paramType = "query") }) public Result getDemandEndData(@RequestParam String ids,@RequestParam String departmentId,@RequestParam String optionType) { - try { - List quarters = demandEndService.getDemandEndData(ids,departmentId,optionType); - return Result.OK(quarters); - } catch (Exception e) { - return Result.error("获取需求单数据失败"); - } + List quarters = demandEndService.getDemandEndData(ids,departmentId,optionType); + return Result.OK(quarters); } @@ -100,12 +103,8 @@ public class LdDemandEndController { @ApiImplicitParam(name = "optionType", value = "选项", dataType = "string", paramType = "query") }) public Result getDemandEndNyData(@RequestParam String ids,@RequestParam String departmentId,@RequestParam String optionType) { - try { - List quarters = demandEndService.getDemandEndNyData(ids,departmentId,optionType); - return Result.OK(quarters); - } catch (Exception e) { - return Result.error("获取需求单数据失败"); - } + List quarters = demandEndService.getDemandEndNyData(ids,departmentId,optionType); + return Result.OK(quarters); } diff --git a/src/main/java/com/nov/KgLowDurable/controller/LdPurchaseEndController.java b/src/main/java/com/nov/KgLowDurable/controller/LdPurchaseEndController.java index f3acf53..00d7ac3 100644 --- a/src/main/java/com/nov/KgLowDurable/controller/LdPurchaseEndController.java +++ b/src/main/java/com/nov/KgLowDurable/controller/LdPurchaseEndController.java @@ -32,10 +32,14 @@ public class LdPurchaseEndController { }) public Result list(@ApiParam(hidden = true) @RequestParam(required = false) String purchaseNo, + @RequestParam(required = false) String materialName, + @RequestParam(required = false) String model, + @RequestParam(required = false) String year, + @RequestParam(required = false) String quarter, @RequestParam(required = false ,defaultValue = "1") Integer pageNum, @RequestParam(required = false ,defaultValue = "10") Integer pageSize) { - return Result.OK(purchaseEndService.getPurchaseEndList(purchaseNo,pageNum,pageSize)); + return Result.OK(purchaseEndService.getPurchaseEndList(purchaseNo,materialName,model,year,quarter,pageNum,pageSize)); } @GetMapping("/getAllQuarter") diff --git a/src/main/java/com/nov/KgLowDurable/mapper/LdDemandEndMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/LdDemandEndMapper.java index ae948c7..b77eee9 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/LdDemandEndMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/LdDemandEndMapper.java @@ -13,7 +13,12 @@ import java.util.List; public interface LdDemandEndMapper extends BaseMapper { - List selectDemandEndList(@Param("demandNo") String demandNo); + List selectDemandEndList(@Param("demandNo") String demandNo, + @Param("materialName") String materialName, + @Param("model") String model, + @Param("department") String department, + @Param("year") String year, + @Param("quarter") String quarter); List getAllQuarter(); diff --git a/src/main/java/com/nov/KgLowDurable/mapper/LdPurchaseEndMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/LdPurchaseEndMapper.java index c97eeb4..c05dbd1 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/LdPurchaseEndMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/LdPurchaseEndMapper.java @@ -12,7 +12,11 @@ import java.util.List; */ public interface LdPurchaseEndMapper extends BaseMapper { - List selectPurchaseEndList(@Param("purchaseNo") String purchaseNo); + List selectPurchaseEndList(@Param("purchaseNo") String purchaseNo, + @Param("materialName") String materialName, + @Param("model") String model, + @Param("year") String year, + @Param("quarter") String quarter); List getAllQuarters(); diff --git a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdOneOutStorageDetail.java b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdOneOutStorageDetail.java index 851eb0f..a76783c 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdOneOutStorageDetail.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdOneOutStorageDetail.java @@ -1,6 +1,7 @@ package com.nov.KgLowDurable.pojo.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -140,6 +141,11 @@ public class LdOneOutStorageDetail implements Serializable { */ private Long oneFormId; + /** + * 库存数量 + */ + @TableField(exist = false) + private BigDecimal num; diff --git a/src/main/java/com/nov/KgLowDurable/service/ILdDemandEndService.java b/src/main/java/com/nov/KgLowDurable/service/ILdDemandEndService.java index 525c82a..4625ebf 100644 --- a/src/main/java/com/nov/KgLowDurable/service/ILdDemandEndService.java +++ b/src/main/java/com/nov/KgLowDurable/service/ILdDemandEndService.java @@ -25,7 +25,7 @@ public interface ILdDemandEndService extends IService { * @param pageSize * @return */ - PageInfo getDemandEndList(String demandNo, Integer pageNum, Integer pageSize); + PageInfo getDemandEndList(String demandNo,String materialName,String model,String department,String year,String quarter, Integer pageNum, Integer pageSize); /** * 获取需求单 diff --git a/src/main/java/com/nov/KgLowDurable/service/ILdPurchaseEndService.java b/src/main/java/com/nov/KgLowDurable/service/ILdPurchaseEndService.java index ab4cbb5..c278e22 100644 --- a/src/main/java/com/nov/KgLowDurable/service/ILdPurchaseEndService.java +++ b/src/main/java/com/nov/KgLowDurable/service/ILdPurchaseEndService.java @@ -20,7 +20,7 @@ public interface ILdPurchaseEndService extends IService { * @param pageSize * @return */ - PageInfo getPurchaseEndList(String purchaseNo, Integer pageNum, Integer pageSize); + PageInfo getPurchaseEndList(String purchaseNo,String materialName,String model,String year,String quarter, Integer pageNum, Integer pageSize); /** * 获取采购单所有季度 diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdDemandEndServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdDemandEndServiceImpl.java index ca6c58c..efb4e3b 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdDemandEndServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdDemandEndServiceImpl.java @@ -47,10 +47,10 @@ public class LdDemandEndServiceImpl extends ServiceImpl getDemandEndList(String demandNo, Integer pageNum, Integer pageSize) { + public PageInfo getDemandEndList(String demandNo,String materialName,String model,String department,String year,String quarter, Integer pageNum, Integer pageSize) { PageHelper.startPage(pageNum,pageSize); - List ldPurchaseEndList = demandEndMapper.selectDemandEndList(demandNo); + List ldPurchaseEndList = demandEndMapper.selectDemandEndList(demandNo,materialName,model,department,year,quarter); PageInfo pageInfo = new PageInfo<>(ldPurchaseEndList); return pageInfo; } @@ -301,10 +301,11 @@ public class LdDemandEndServiceImpl extends ServiceImpl getPurchaseEndList(String purchaseNo, Integer pageNum, Integer pageSize) { + public PageInfo getPurchaseEndList(String purchaseNo,String materialName,String model,String year,String quarter, Integer pageNum, Integer pageSize) { PageHelper.startPage(pageNum,pageSize); - List ldPurchaseEndList = purchaseEndMapper.selectPurchaseEndList(purchaseNo); + List ldPurchaseEndList = purchaseEndMapper.selectPurchaseEndList(purchaseNo,materialName,model,year,quarter); PageInfo pageInfo = new PageInfo<>(ldPurchaseEndList); return pageInfo; } @@ -63,6 +63,7 @@ public class LdPurchaseEndServiceImpl extends ServiceImpl idList = Arrays.stream(ids.split(",")).map(Long::valueOf).collect(Collectors.toList()); List onePutStoragePurchaseEndList = onePutStoragePurchaseEndService.selectByPurchaseEndId(idList); + Map map = new HashMap<>(); if(!CollectionUtils.isEmpty(onePutStoragePurchaseEndList)){ //获取一级库ID List onePutStorageIds = onePutStoragePurchaseEndList.stream() @@ -79,10 +80,11 @@ public class LdPurchaseEndServiceImpl extends ServiceImpl ldOnePutStorageDetailList = onePutStorageDetailService.getSummaryData(collect); ldOnePutStorageDetailList.forEach(detail ->{ - detail.setYetInboundQuantity(detail.getInboundQuantity()); + map.put(detail.getMaterialId(),detail.getInboundQuantity()); + //detail.setYetInboundQuantity(detail.getInboundQuantity()); }); - ldOnePutStorageDetailList.sort(Comparator.comparing(LdOnePutStorageDetail::getMaterialCode)); - return ldOnePutStorageDetailList; + /*ldOnePutStorageDetailList.sort(Comparator.comparing(LdOnePutStorageDetail::getMaterialCode)); + return ldOnePutStorageDetailList;*/ } } @@ -105,6 +107,9 @@ public class LdPurchaseEndServiceImpl extends ServiceImpl FROM ld_demand_end - - WHERE demand_no LIKE CONCAT('%', #{demandNo}, '%') - + + + and demand_no LIKE CONCAT('%', #{demandNo}, '%') + + + and material_name LIKE CONCAT('%', #{materialName}, '%') + + + and model LIKE CONCAT('%', #{model}, '%') + + + and department LIKE CONCAT('%', #{department}, '%') + + + and year = #{year} + + + and quarter = #{quarter} + + + - select * from ld_one_out_storage_demand_end - where demand_end_id in + select a.* from ld_one_out_storage_demand_end a left join ld_one_out_storage b on a.one_out_storage_id = b.id + where b.status = 3 + and demand_end_id in #{id} diff --git a/src/main/resources/mapper/LdOneOutStorageDetailMapper.xml b/src/main/resources/mapper/LdOneOutStorageDetailMapper.xml index fa8053b..d341825 100644 --- a/src/main/resources/mapper/LdOneOutStorageDetailMapper.xml +++ b/src/main/resources/mapper/LdOneOutStorageDetailMapper.xml @@ -30,20 +30,20 @@ - id, one_form_id, one_out_storage_id, one_out_storage_no, one_out_detail_code, ld_demand_end_id, material_id, material_name, material_code, model, type, unit, application_quantity, outbound_quantity, outbound_sum_quantity, shipper_status, out_storage_person, out_storage_time, department, department_name, department_people_id, department_people_name, remark + a.id, a.one_form_id, a.one_out_storage_id, a.one_out_storage_no, a.one_out_detail_code, a.ld_demand_end_id, a.material_id, a.material_name, a.material_code, a.model, a.type, a.unit, a.application_quantity, a.outbound_quantity, a.outbound_sum_quantity, a.shipper_status, a.out_storage_person, a.out_storage_time, a.department, a.department_name, a.department_people_id, a.department_people_name, a.remark diff --git a/src/main/resources/mapper/LdOnePutStorageDetailMapper.xml b/src/main/resources/mapper/LdOnePutStorageDetailMapper.xml index f41b2b4..6c231e1 100644 --- a/src/main/resources/mapper/LdOnePutStorageDetailMapper.xml +++ b/src/main/resources/mapper/LdOnePutStorageDetailMapper.xml @@ -76,7 +76,6 @@ material_name, material_code, model, - type, unit, required_quantity, SUM(inbound_quantity) as inbound_quantity @@ -92,7 +91,6 @@ material_name, material_code, model, - type, unit, required_quantity ORDER BY ld_purchase_end_id, material_id; diff --git a/src/main/resources/mapper/LdPurchaseEndMapper.xml b/src/main/resources/mapper/LdPurchaseEndMapper.xml index 19cd381..f141e66 100644 --- a/src/main/resources/mapper/LdPurchaseEndMapper.xml +++ b/src/main/resources/mapper/LdPurchaseEndMapper.xml @@ -26,9 +26,24 @@ SELECT FROM ld_purchase_end - - WHERE purchase_no LIKE CONCAT('%', #{purchaseNo}, '%') - + + + and purchase_no LIKE CONCAT('%', #{purchaseNo}, '%') + + + and material_name LIKE CONCAT('%', #{materialName}, '%') + + + and model LIKE CONCAT('%', #{model}, '%') + + + and year = #{year} + + + and quarter = #{quarter} + + +