Commit 088f5eb995a824ff4663252da3007ecc5e386d7f

Authored by 房远帅
1 parent 8f3c397b

采购-入库:测试过程问题处理

... ... @@ -52,6 +52,9 @@ public class WeighingTicketPlanBo implements Serializable {
52 52 @ApiModelProperty("计划类型 补单 变更 补单+变更")
53 53 private String planType;
54 54
  55 + @ApiModelProperty("交提货方式")
  56 + private String deliveryMode;
  57 +
55 58 @ApiModelProperty("数量合计")
56 59 private BigDecimal totalQuantity;
57 60
... ...
... ... @@ -46,7 +46,7 @@ public class ProcurementWarehouseReceiveOrderController extends DefaultBaseContr
46 46 private ProcurementWarehouseReceiveOrderService warehouseReceiveOrderService;
47 47
48 48 @ApiOperation("分页查询仓库收料单")
49   - @HasPermission({"warehouse-manage:warehouse-receive:query"})
  49 + @HasPermission({"warehouse-manage:warehouse-material:query"})
50 50 @GetMapping("/query")
51 51 public InvokeResult<PageResult<GetWarehouseReceiveOrderBo>> query(
52 52 @Valid QueryWarehouseReceiveOrderVo vo) {
... ... @@ -67,7 +67,7 @@ public class ProcurementWarehouseReceiveOrderController extends DefaultBaseContr
67 67
68 68 @ApiOperation("查询仓库收料单详情")
69 69 @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true)
70   - @HasPermission({"warehouse-manage:warehouse-receive:query", "warehouse-manage:warehouse-receive:review"})
  70 + @HasPermission({"warehouse-manage:warehouse-material:query", "warehouse-manage:warehouse-material:review"})
71 71 @GetMapping("")
72 72 public InvokeResult<GetWarehouseReceiveOrderBo> findById(
73 73 @NotBlank(message = "ID不能为空!") String id) {
... ... @@ -89,7 +89,7 @@ public class ProcurementWarehouseReceiveOrderController extends DefaultBaseContr
89 89 }
90 90
91 91 @ApiOperation("新增仓库收料单(草稿,原料核算岗-供应管理科)")
92   - @HasPermission({"warehouse-manage:warehouse-receive:add"})
  92 + @HasPermission({"warehouse-manage:warehouse-material:add"})
93 93 @PostMapping("")
94 94 public InvokeResult<String> create(@RequestBody @Valid CreateWarehouseReceiveOrderVo vo) {
95 95 String id = warehouseReceiveOrderService.create(vo);
... ... @@ -97,7 +97,7 @@ public class ProcurementWarehouseReceiveOrderController extends DefaultBaseContr
97 97 }
98 98
99 99 @ApiOperation("修改仓库收料单(仅草稿、已驳回可修改)")
100   - @HasPermission({"warehouse-manage:warehouse-receive:modify"})
  100 + @HasPermission({"warehouse-manage:warehouse-material:modify", "warehouse-manage:warehouse-material:approve"})
101 101 @PutMapping("")
102 102 public InvokeResult<Void> update(@RequestBody @Valid UpdateWarehouseReceiveOrderVo vo) {
103 103 warehouseReceiveOrderService.update(vo);
... ... @@ -106,7 +106,7 @@ public class ProcurementWarehouseReceiveOrderController extends DefaultBaseContr
106 106
107 107 @ApiOperation("提交仓库收料单审核")
108 108 @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true)
109   - @HasPermission({"warehouse-manage:warehouse-receive:submit"})
  109 + @HasPermission({"warehouse-manage:warehouse-material:submit"})
110 110 @PutMapping("/submit")
111 111 public InvokeResult<Void> submit(@NotBlank(message = "ID不能为空!") String id) {
112 112 warehouseReceiveOrderService.submit(id);
... ... @@ -114,7 +114,7 @@ public class ProcurementWarehouseReceiveOrderController extends DefaultBaseContr
114 114 }
115 115
116 116 @ApiOperation("调整实收数(仅审核中且流程节点为分厂仓库统计员环节可调整,合计由前端计算传入)")
117   - @HasPermission({"warehouse-manage:warehouse-receive:modify"})
  117 + @HasPermission({"warehouse-manage:warehouse-material:modify", "warehouse-manage:warehouse-material:approve"})
118 118 @PutMapping("/actualQuantity")
119 119 public InvokeResult<Void> updateActualQuantity(
120 120 @RequestBody @Valid UpdateWarehouseReceiveActualQuantityVo vo) {
... ... @@ -124,7 +124,7 @@ public class ProcurementWarehouseReceiveOrderController extends DefaultBaseContr
124 124
125 125 @ApiOperation("取消仓库收料单(草稿、已驳回状态可取消)")
126 126 @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true)
127   - @HasPermission({"warehouse-manage:warehouse-receive:cancel"})
  127 + @HasPermission({"warehouse-manage:warehouse-material:cancel"})
128 128 @PutMapping("/cancel")
129 129 public InvokeResult<Void> cancel(@NotBlank(message = "ID不能为空!") String id) {
130 130 warehouseReceiveOrderService.cancel(id);
... ...
... ... @@ -91,7 +91,7 @@ public class ProcurementWeighingTicketController extends DefaultBaseController {
91 91 return InvokeResultBuilder.success(procurementWeighingTicketService.findDetail(id));
92 92 }
93 93
94   - @ApiOperation("分页查询可关联过磅码单的采购计划(新增选择计划弹窗:未冻结、流程已完成、不在变更/补单中)")
  94 + @ApiOperation("分页查询可关联过磅码单的采购计划(新增选择计划弹窗:未冻结、流程已完成、不在变更/补单中、关联内贸采购合同有效且审核通过)")
95 95 @GetMapping("/weighingTicketPlans")
96 96 public InvokeResult<PageResult<WeighingTicketPlanBo>> queryWeighingTicketPlans(
97 97 @Valid QueryWeighingTicketPlanVo vo) {
... ... @@ -269,7 +269,8 @@ public class ProcurementWeighingTicketController extends DefaultBaseController {
269 269 dataMap.put("firstGrossWeightTime",
270 270 data.getFirstGrossWeightTime() == null ? "" : data.getFirstGrossWeightTime().format(dateFormatter));
271 271 dataMap.put("supplierName", nvl(data.getSupplierName()));
272   - dataMap.put("code", nvl(data.getCode()));
  272 + // 码单编号位置显示计划编号(多个用中文逗号隔开)
  273 + dataMap.put("code", data.getPlanCode() == null ? "" : String.join(",", data.getPlanCode()));
273 274 dataMap.put("receiveUnitName", nvl(data.getReceiveUnitName()));
274 275 dataMap.put("materialName", nvl(data.getMaterialName()));
275 276 dataMap.put("totalGrossWeight", formatDecimal(data.getTotalGrossWeight()));
... ...
... ... @@ -28,6 +28,9 @@ public class QueryWeighingTicketPlanVo extends SortPageVo implements Serializabl
28 28 @ApiModelProperty("计划类型")
29 29 private String planType;
30 30
  31 + @ApiModelProperty("交提货方式")
  32 + private String deliveryMode;
  33 +
31 34 @ApiModelProperty("一致性锁定-是否买断(已选计划后传入,只返回同买断属性的计划)")
32 35 private Boolean buyout;
33 36
... ...
... ... @@ -198,6 +198,7 @@
198 198 <result column="region_name" property="regionName"/>
199 199 <result column="process_status" property="processStatus"/>
200 200 <result column="plan_type" property="planType"/>
  201 + <result column="delivery_mode" property="deliveryMode"/>
201 202 <result column="total_quantity" property="totalQuantity"/>
202 203 <result column="buyout" property="buyout"/>
203 204 <result column="workshop_id" property="workshopId"/>
... ... @@ -220,6 +221,7 @@
220 221 sd1.name AS region_name,
221 222 pp.process_status,
222 223 pp.plan_type,
  224 + pp.delivery_mode,
223 225 pp.total_quantity,
224 226 CASE WHEN pp.commodity_buyout = 1 OR pp.quality_buyout = 1 OR pp.quantity_buyout = 1
225 227 THEN 1 ELSE 0 END AS buyout,
... ... @@ -244,6 +246,13 @@
244 246 <!-- 不在补单中(空或补单完成可选) -->
245 247 AND (pp.replenishment_status = '' OR pp.replenishment_status IS NULL
246 248 OR pp.replenishment_status = 'REPLENISHED')
  249 + <!-- 关联的内贸采购合同必须有效且审核通过 -->
  250 + AND EXISTS (
  251 + SELECT 1 FROM procurement_contract pc
  252 + WHERE pc.procurement_plan_id = pp.id
  253 + AND pc.deleted = 0
  254 + AND pc.approval_status = 'PASS'
  255 + )
247 256 <!-- 多计划一致性:非买断/买断、供料单位、收料单位保持一致 -->
248 257 <if test="vo != null">
249 258 <if test="vo.code != null and vo.code != ''">
... ... @@ -261,6 +270,9 @@
261 270 <if test="vo.planType != null and vo.planType != ''">
262 271 AND pp.plan_type = #{vo.planType}
263 272 </if>
  273 + <if test="vo.deliveryMode != null and vo.deliveryMode != ''">
  274 + AND pp.delivery_mode = #{vo.deliveryMode}
  275 + </if>
264 276 <if test="vo.buyout != null">
265 277 <choose>
266 278 <when test="vo.buyout">
... ...