Commit c79f186f51ffc2c5881e322898b101805af485e0

Authored by 房远帅
1 parent a79a5308

采购-入库:原料结算详情单权限

@@ -48,7 +48,7 @@ public class ProcurementMaterialSettleDetailController extends DefaultBaseContro @@ -48,7 +48,7 @@ public class ProcurementMaterialSettleDetailController extends DefaultBaseContro
48 private ProcurementMaterialSettleDetailService procurementMaterialSettleDetailService; 48 private ProcurementMaterialSettleDetailService procurementMaterialSettleDetailService;
49 49
50 @ApiOperation("分页查询原料结算详情单") 50 @ApiOperation("分页查询原料结算详情单")
51 - @HasPermission({"warehouse-manage:material-settle:query"}) 51 + @HasPermission({"warehouse-manage:material-settlement:query"})
52 @GetMapping("/query") 52 @GetMapping("/query")
53 public InvokeResult<PageResult<GetProcurementMaterialSettleDetailBo>> query( 53 public InvokeResult<PageResult<GetProcurementMaterialSettleDetailBo>> query(
54 @Valid QueryProcurementMaterialSettleDetailVo vo) { 54 @Valid QueryProcurementMaterialSettleDetailVo vo) {
@@ -65,7 +65,7 @@ public class ProcurementMaterialSettleDetailController extends DefaultBaseContro @@ -65,7 +65,7 @@ public class ProcurementMaterialSettleDetailController extends DefaultBaseContro
65 65
66 @ApiOperation("查询原料结算详情单详情") 66 @ApiOperation("查询原料结算详情单详情")
67 @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) 67 @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true)
68 - @HasPermission({"warehouse-manage:material-settle:query", "warehouse-manage:material-settle:review"}) 68 + @HasPermission({"warehouse-manage:material-settlement:query", "warehouse-manage:material-settlement:review"})
69 @GetMapping("") 69 @GetMapping("")
70 public InvokeResult<GetProcurementMaterialSettleDetailBo> findById( 70 public InvokeResult<GetProcurementMaterialSettleDetailBo> findById(
71 @NotBlank(message = "ID不能为空!") String id) { 71 @NotBlank(message = "ID不能为空!") String id) {
@@ -99,7 +99,7 @@ public class ProcurementMaterialSettleDetailController extends DefaultBaseContro @@ -99,7 +99,7 @@ public class ProcurementMaterialSettleDetailController extends DefaultBaseContro
99 } 99 }
100 100
101 @ApiOperation("新增原料结算详情单(草稿,分厂仓库统计员)") 101 @ApiOperation("新增原料结算详情单(草稿,分厂仓库统计员)")
102 - @HasPermission({"warehouse-manage:material-settle:add"}) 102 + @HasPermission({"warehouse-manage:material-settlement:add"})
103 @PostMapping("") 103 @PostMapping("")
104 public InvokeResult<String> create(@RequestBody @Valid CreateProcurementMaterialSettleDetailVo vo) { 104 public InvokeResult<String> create(@RequestBody @Valid CreateProcurementMaterialSettleDetailVo vo) {
105 String id = procurementMaterialSettleDetailService.create(vo); 105 String id = procurementMaterialSettleDetailService.create(vo);
@@ -107,7 +107,7 @@ public class ProcurementMaterialSettleDetailController extends DefaultBaseContro @@ -107,7 +107,7 @@ public class ProcurementMaterialSettleDetailController extends DefaultBaseContro
107 } 107 }
108 108
109 @ApiOperation("修改原料结算详情单(仅草稿、已驳回可修改)") 109 @ApiOperation("修改原料结算详情单(仅草稿、已驳回可修改)")
110 - @HasPermission({"warehouse-manage:material-settle:update"}) 110 + @HasPermission({"warehouse-manage:material-settlement:update", "warehouse-manage:material-settlement:approve"})
111 @PutMapping("") 111 @PutMapping("")
112 public InvokeResult<Void> update(@RequestBody @Valid UpdateProcurementMaterialSettleDetailVo vo) { 112 public InvokeResult<Void> update(@RequestBody @Valid UpdateProcurementMaterialSettleDetailVo vo) {
113 procurementMaterialSettleDetailService.update(vo); 113 procurementMaterialSettleDetailService.update(vo);
@@ -116,7 +116,7 @@ public class ProcurementMaterialSettleDetailController extends DefaultBaseContro @@ -116,7 +116,7 @@ public class ProcurementMaterialSettleDetailController extends DefaultBaseContro
116 116
117 @ApiOperation("提交原料结算详情单审核(过磅合计数不等于折斤+退料+入库净重合计数时无法提交)") 117 @ApiOperation("提交原料结算详情单审核(过磅合计数不等于折斤+退料+入库净重合计数时无法提交)")
118 @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) 118 @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true)
119 - @HasPermission({"warehouse-manage:material-settle:submit"}) 119 + @HasPermission({"warehouse-manage:material-settlement:submit"})
120 @PutMapping("/submit") 120 @PutMapping("/submit")
121 public InvokeResult<Void> submit(@NotBlank(message = "ID不能为空!") String id) { 121 public InvokeResult<Void> submit(@NotBlank(message = "ID不能为空!") String id) {
122 procurementMaterialSettleDetailService.submit(id); 122 procurementMaterialSettleDetailService.submit(id);
@@ -125,7 +125,7 @@ public class ProcurementMaterialSettleDetailController extends DefaultBaseContro @@ -125,7 +125,7 @@ public class ProcurementMaterialSettleDetailController extends DefaultBaseContro
125 125
126 @ApiOperation("退回原料结算详情单至草稿(仓库主管审批通过后可退回,已生成仓库收料单或买断入库核算单的不可退回)") 126 @ApiOperation("退回原料结算详情单至草稿(仓库主管审批通过后可退回,已生成仓库收料单或买断入库核算单的不可退回)")
127 @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) 127 @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true)
128 - @HasPermission({"warehouse-manage:material-settle:return"}) 128 + @HasPermission({"warehouse-manage:material-settlement:back"})
129 @PutMapping("/returnDraft") 129 @PutMapping("/returnDraft")
130 public InvokeResult<Void> returnDraft(@NotBlank(message = "ID不能为空!") String id) { 130 public InvokeResult<Void> returnDraft(@NotBlank(message = "ID不能为空!") String id) {
131 procurementMaterialSettleDetailService.returnDraft(id); 131 procurementMaterialSettleDetailService.returnDraft(id);
@@ -134,7 +134,7 @@ public class ProcurementMaterialSettleDetailController extends DefaultBaseContro @@ -134,7 +134,7 @@ public class ProcurementMaterialSettleDetailController extends DefaultBaseContro
134 134
135 @ApiOperation("取消原料结算详情单(草稿、已驳回状态可取消)") 135 @ApiOperation("取消原料结算详情单(草稿、已驳回状态可取消)")
136 @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) 136 @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true)
137 - @HasPermission({"warehouse-manage:material-settle:cancel"}) 137 + @HasPermission({"warehouse-manage:material-settlement:cancel"})
138 @PutMapping("/cancel") 138 @PutMapping("/cancel")
139 public InvokeResult<Void> cancel(@NotBlank(message = "ID不能为空!") String id) { 139 public InvokeResult<Void> cancel(@NotBlank(message = "ID不能为空!") String id) {
140 procurementMaterialSettleDetailService.cancel(id); 140 procurementMaterialSettleDetailService.cancel(id);
@@ -90,7 +90,7 @@ public class ProcurementAssayReport extends BaseEntity implements BaseDto { @@ -90,7 +90,7 @@ public class ProcurementAssayReport extends BaseEntity implements BaseDto {
90 private String processOpinion; 90 private String processOpinion;
91 91
92 /** 92 /**
93 - * 是否继续审批(原料质检员填写)true-是 false-否 93 + * 是否继续审批true-是 false-否
94 */ 94 */
95 private Boolean continueApproval; 95 private Boolean continueApproval;
96 96
@@ -115,34 +115,24 @@ public class ProcurementMaterialSettleDetailServiceImpl @@ -115,34 +115,24 @@ public class ProcurementMaterialSettleDetailServiceImpl
115 115
116 @Resource 116 @Resource
117 private ProcurementMaterialSettleDetailMapper settleDetailMapper; 117 private ProcurementMaterialSettleDetailMapper settleDetailMapper;
118 -  
119 @Resource 118 @Resource
120 private ProcurementMaterialSettleApplyLineService applyLineService; 119 private ProcurementMaterialSettleApplyLineService applyLineService;
121 -  
122 @Resource 120 @Resource
123 private ProcurementMaterialSettleLineService settleLineService; 121 private ProcurementMaterialSettleLineService settleLineService;
124 -  
125 @Resource 122 @Resource
126 private ProcurementWeighingTicketMapper weighingTicketMapper; 123 private ProcurementWeighingTicketMapper weighingTicketMapper;
127 -  
128 @Resource 124 @Resource
129 private ProcurementWeighingTicketLineService weighLineService; 125 private ProcurementWeighingTicketLineService weighLineService;
130 -  
131 @Resource 126 @Resource
132 private ProcurementWeighingTicketApplyLineService weighApplyLineService; 127 private ProcurementWeighingTicketApplyLineService weighApplyLineService;
133 -  
134 @Resource 128 @Resource
135 private ProcurementAssayReportMapper assayReportMapper; 129 private ProcurementAssayReportMapper assayReportMapper;
136 -  
137 @Resource 130 @Resource
138 private ProcurementPlanService procurementPlanService; 131 private ProcurementPlanService procurementPlanService;
139 -  
140 @Resource 132 @Resource
141 private FlowInstanceWrapperService flowInstanceWrapperService; 133 private FlowInstanceWrapperService flowInstanceWrapperService;
142 -  
143 @Resource 134 @Resource
144 private FlowTaskWrapperMapper flowTaskWrapperMapper; 135 private FlowTaskWrapperMapper flowTaskWrapperMapper;
145 -  
146 @Resource 136 @Resource
147 private FlowTaskWrapperService flowTaskWrapperService; 137 private FlowTaskWrapperService flowTaskWrapperService;
148 138
@@ -521,6 +511,17 @@ public class ProcurementMaterialSettleDetailServiceImpl @@ -521,6 +511,17 @@ public class ProcurementMaterialSettleDetailServiceImpl
521 } 511 }
522 512
523 @Override 513 @Override
  514 + public boolean existsPassedByWeighingTicketId(String weighingTicketId) {
  515 + if (StringUtil.isBlank(weighingTicketId)) {
  516 + return false;
  517 + }
  518 + return this.count(Wrappers.lambdaQuery(ProcurementMaterialSettleDetail.class)
  519 + .eq(ProcurementMaterialSettleDetail::getWeighingTicketId, weighingTicketId)
  520 + .eq(ProcurementMaterialSettleDetail::getApprovalStatus, STATUS_PASS)
  521 + .eq(ProcurementMaterialSettleDetail::getDeleted, false)) > 0;
  522 + }
  523 +
  524 + @Override
524 @Transactional(rollbackFor = Exception.class) 525 @Transactional(rollbackFor = Exception.class)
525 public void deleteByWeighingTicketId(String weighingTicketId) { 526 public void deleteByWeighingTicketId(String weighingTicketId) {
526 if (StringUtil.isBlank(weighingTicketId)) { 527 if (StringUtil.isBlank(weighingTicketId)) {
@@ -38,6 +38,7 @@ import com.lframework.xingyun.sc.procurement.entity.weighing.ProcurementWeighing @@ -38,6 +38,7 @@ import com.lframework.xingyun.sc.procurement.entity.weighing.ProcurementWeighing
38 import com.lframework.xingyun.sc.procurement.mappers.weighing.ProcurementAssayApplyMapper; 38 import com.lframework.xingyun.sc.procurement.mappers.weighing.ProcurementAssayApplyMapper;
39 import com.lframework.xingyun.sc.procurement.mappers.weighing.ProcurementAssayReportMapper; 39 import com.lframework.xingyun.sc.procurement.mappers.weighing.ProcurementAssayReportMapper;
40 import com.lframework.xingyun.sc.procurement.mappers.weighing.ProcurementWeighingTicketMapper; 40 import com.lframework.xingyun.sc.procurement.mappers.weighing.ProcurementWeighingTicketMapper;
  41 +import com.lframework.xingyun.sc.procurement.service.settle.ProcurementMaterialSettleDetailService;
41 import com.lframework.xingyun.sc.procurement.service.weighing.ProcurementAssayReportLineService; 42 import com.lframework.xingyun.sc.procurement.service.weighing.ProcurementAssayReportLineService;
42 import com.lframework.xingyun.sc.procurement.service.weighing.ProcurementAssayReportService; 43 import com.lframework.xingyun.sc.procurement.service.weighing.ProcurementAssayReportService;
43 import com.lframework.xingyun.sc.procurement.service.weighing.ProcurementWeighingTicketLineService; 44 import com.lframework.xingyun.sc.procurement.service.weighing.ProcurementWeighingTicketLineService;
@@ -128,6 +129,9 @@ public class ProcurementAssayReportServiceImpl @@ -128,6 +129,9 @@ public class ProcurementAssayReportServiceImpl
128 private ProcurementWeighingTicketLineService weighLineService; 129 private ProcurementWeighingTicketLineService weighLineService;
129 130
130 @Resource 131 @Resource
  132 + private ProcurementMaterialSettleDetailService settleDetailService;
  133 +
  134 + @Resource
131 private WorkshopService workshopService; 135 private WorkshopService workshopService;
132 136
133 @Resource 137 @Resource
@@ -539,17 +543,24 @@ public class ProcurementAssayReportServiceImpl @@ -539,17 +543,24 @@ public class ProcurementAssayReportServiceImpl
539 if (entity == null) { 543 if (entity == null) {
540 throw new DefaultClientException("原料化验报告单不存在!"); 544 throw new DefaultClientException("原料化验报告单不存在!");
541 } 545 }
542 - //todo 联动结算详情单审核通过不允许作废、不是审核通过的同步作废原料结算详情单  
543 546
544 // 手动作废:仅审核通过的报告单可作废 547 // 手动作废:仅审核通过的报告单可作废
545 if (!STATUS_PASS.equals(entity.getApprovalStatus())) { 548 if (!STATUS_PASS.equals(entity.getApprovalStatus())) {
546 throw new DefaultClientException("仅审核通过的原料化验报告单可作废!"); 549 throw new DefaultClientException("仅审核通过的原料化验报告单可作废!");
547 } 550 }
548 551
  552 + // 联动校验:该码单下存在审核通过的原料结算详情单时不允许作废(结算已完成,化验结果不可变)
  553 + if (settleDetailService.existsPassedByWeighingTicketId(entity.getWeighingTicketId())) {
  554 + throw new DefaultClientException("该码单已存在审核通过的原料结算详情单,不允许作废原料化验报告单!");
  555 + }
  556 +
549 this.update(Wrappers.lambdaUpdate(ProcurementAssayReport.class) 557 this.update(Wrappers.lambdaUpdate(ProcurementAssayReport.class)
550 .set(ProcurementAssayReport::getDeleted, true) 558 .set(ProcurementAssayReport::getDeleted, true)
551 .eq(ProcurementAssayReport::getId, id)); 559 .eq(ProcurementAssayReport::getId, id));
552 560
  561 + // 联动作废:该码单下未审核通过的原料结算详情单同步作废(审核中的先终止流程再作废)
  562 + settleDetailService.deleteByWeighingTicketId(entity.getWeighingTicketId());
  563 +
553 OpLogUtil.setVariable("id", id); 564 OpLogUtil.setVariable("id", id);
554 OpLogUtil.setExtra(entity); 565 OpLogUtil.setExtra(entity);
555 } 566 }
@@ -93,4 +93,9 @@ public interface ProcurementMaterialSettleDetailService @@ -93,4 +93,9 @@ public interface ProcurementMaterialSettleDetailService
93 * @param weighingTicketId 过磅码单ID 93 * @param weighingTicketId 过磅码单ID
94 */ 94 */
95 void deleteByWeighingTicketId(String weighingTicketId); 95 void deleteByWeighingTicketId(String weighingTicketId);
  96 +
  97 + /**
  98 + * 码单下是否存在审核通过的原料结算详情单(化验报告单作废联动校验用)
  99 + */
  100 + boolean existsPassedByWeighingTicketId(String weighingTicketId);
96 } 101 }
@@ -41,6 +41,9 @@ public class QueryProcurementMaterialSettleDetailVo extends SortPageVo implement @@ -41,6 +41,9 @@ public class QueryProcurementMaterialSettleDetailVo extends SortPageVo implement
41 @ApiModelProperty("审核状态 DRAFT/AUDIT/PASS/REFUSE/CANCEL") 41 @ApiModelProperty("审核状态 DRAFT/AUDIT/PASS/REFUSE/CANCEL")
42 private String approvalStatus; 42 private String approvalStatus;
43 43
  44 + @ApiModelProperty("是否作废 true-已作废 false-有效单(不传默认查有效单)")
  45 + private Boolean deleted;
  46 +
44 @ApiModelProperty("创建人ID集合(数据权限用,后端注入)") 47 @ApiModelProperty("创建人ID集合(数据权限用,后端注入)")
45 private List<String> createByIdList; 48 private List<String> createByIdList;
46 } 49 }
@@ -88,7 +88,14 @@ @@ -88,7 +88,14 @@
88 <select id="query" resultMap="ProcurementMaterialSettleDetailResult"> 88 <select id="query" resultMap="ProcurementMaterialSettleDetailResult">
89 <include refid="PMSD_sql"/> 89 <include refid="PMSD_sql"/>
90 <where> 90 <where>
91 - tb.deleted = 0 91 + <choose>
  92 + <when test="vo.deleted != null">
  93 + tb.deleted = #{vo.deleted}
  94 + </when>
  95 + <otherwise>
  96 + tb.deleted = 0
  97 + </otherwise>
  98 + </choose>
92 <if test="vo.weighingTicketCode != null and vo.weighingTicketCode != ''"> 99 <if test="vo.weighingTicketCode != null and vo.weighingTicketCode != ''">
93 AND tb.weighing_ticket_code LIKE CONCAT('%', #{vo.weighingTicketCode}, '%') 100 AND tb.weighing_ticket_code LIKE CONCAT('%', #{vo.weighingTicketCode}, '%')
94 </if> 101 </if>