调料调差3

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/dto/MaterialListDTO.java

@@ -22,4 +22,7 @@ public class MaterialListDTO {
 
     @ApiModelProperty(value = "材料名称")
     private String materialName;
+
+    @ApiModelProperty(value = "材料计量期id")
+    private Long meterPeriodId;
 }

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/ContractMaterialController.java

@@ -147,8 +147,16 @@ public class ContractMaterialController extends BladeController {
 		return R.data(list);
 	}
 
-	@GetMapping("/get-adjust-form-tree")
+	@PostMapping("/get-all-material3")
 	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "材料调差-当前期未调差材料不分页", notes = "传入合同id,材料计量期id")
+	public R<List<ContractMaterialVO4>> getAllMaterial3(@RequestBody MaterialListDTO dto) {
+		List<ContractMaterialVO4> list = contractMaterialService.getAllMaterial3(dto);
+		return R.data(list);
+	}
+
+	@GetMapping("/get-adjust-form-tree")
+	@ApiOperationSupport(order = 10)
 	@ApiOperation(value = "调差系数-绑定清单-获取清单树", notes = "传入合同id,材料id")
 	public R<GetAdjustFormTreeVO> getAdjustFormTree(Long contractId,Long materialId) {
 		GetAdjustFormTreeVO vo = contractMaterialService.getAdjustFormTree(contractId,materialId);
@@ -156,7 +164,7 @@ public class ContractMaterialController extends BladeController {
 	}
 
 	@PostMapping("/material-link-form")
-	@ApiOperationSupport(order = 10)
+	@ApiOperationSupport(order = 11)
 	@ApiOperation(value = "调差系数-绑定清单-确定绑定", notes = "传入项目id,合同id,材料id,节点数组")
 	public R materialLinkForm(@Valid @RequestBody MaterialLinkFormDTO dto) {
 		contractMaterialService.materialLinkForm(dto);
@@ -164,7 +172,7 @@ public class ContractMaterialController extends BladeController {
 	}
 
 	@GetMapping("/get-link-all-form")
-	@ApiOperationSupport(order = 11)
+	@ApiOperationSupport(order = 12)
 	@ApiOperation(value = "调差系数-编辑获取清单列表", notes = "传入合同id,材料id")
 	public R<List<GetLinkAllFormVO>> getLinkAllForm(Long contractId,Long materialId) {
 		List<GetLinkAllFormVO> vos = contractMaterialService.getLinkAllForm(contractId,materialId);
@@ -172,14 +180,14 @@ public class ContractMaterialController extends BladeController {
 	}
 
 	@GetMapping("/remove-link-form")
-	@ApiOperationSupport(order = 12)
+	@ApiOperationSupport(order = 13)
 	@ApiOperation(value = "调差系数-解除绑定关系", notes = "传入材料和清单绑定关系id")
 	public R removeLinkForm(Long id) {
 		contractMaterialService.removeLinkForm(id);
 		return R.success("解除成功");
 	}
 	@PostMapping("/submit-link-form")
-	@ApiOperationSupport(order = 13)
+	@ApiOperationSupport(order = 14)
 	@ApiOperation(value = "调差系数-提交编辑", notes = "传入编辑列表数据,只传入id和调差系数")
 	public R submitLinkForm(@RequestBody List<InventoryFormMaterial> list) {
 		formMaterialService.updateBatchById(list);

blade-service/blade-meter/src/main/java/org/springblade/meter/mapper/ContractMaterialMapper.java

@@ -48,4 +48,6 @@ public interface ContractMaterialMapper extends BaseMapper<ContractMaterial> {
     List<ContractMaterialVO4> getALLMaterial3(@Param("dto") MaterialListDTO dto);
 
     List<GetLinkAllFormVO> getLinkAllForm(@Param("contractId") Long contractId,@Param("materialId") Long materialId);
+
+    List<ContractMaterialVO4> getALLUnAdjustMaterial(@Param("dto") MaterialListDTO dto);
 }

blade-service/blade-meter/src/main/java/org/springblade/meter/mapper/ContractMaterialMapper.xml

@@ -64,6 +64,12 @@
         from s_inventory_form_material ifm
         where  is_deleted = 0 and contract_id = #{contractId} and contract_material_id = #{materialId}
     </select>
+    <select id="getALLUnAdjustMaterial" resultType="org.springblade.meter.vo.ContractMaterialVO4">
+        select id,material_number,material_name,unit,price
+        from s_contract_material where is_deleted = 0 and contract_id = #{dto.contractId}
+        and id not in (select contract_material_id from s_contract_material_adjust cma where cma.is_deleted = 0
+                                and cma.contract_id = #{dto.contractId} and cma.meter_period_id = #{dto.meterPeriodId})
+    </select>
 
 
 </mapper>

blade-service/blade-meter/src/main/java/org/springblade/meter/service/IContractMaterialService.java

@@ -58,4 +58,6 @@ public interface IContractMaterialService extends BaseService<ContractMaterial>
     List<GetLinkAllFormVO> getLinkAllForm(Long contractId, Long materialId);
 
     void removeLinkForm(Long id);
+
+    List<ContractMaterialVO4> getAllMaterial3(MaterialListDTO dto);
 }

blade-service/blade-meter/src/main/java/org/springblade/meter/service/impl/ContractMaterialServiceImpl.java

@@ -245,4 +245,10 @@ public class ContractMaterialServiceImpl extends BaseServiceImpl<ContractMateria
     public void removeLinkForm(Long id) {
         formMaterialService.removeById(id);
     }
+
+    @Override
+    public List<ContractMaterialVO4> getAllMaterial3(MaterialListDTO dto) {
+        List<ContractMaterialVO4> vo4List = baseMapper.getALLUnAdjustMaterial(dto);
+        return vo4List;
+    }
 }