wms / wms_shandonghaiwang · Commits

Commit 4a581bc6bb9b59e5c35ad1d45ac8a94e7e7c6ff4

Authored by 易文鹏
1 parent 1566ced8

入库任务和出库单错误超3次不自动回传了

Inline Side-by-side
Showing 7 changed files with 54 additions and 7 deletions
src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
  View file @4a581bc
... ... @@ -180,6 +180,7 @@ public class RyTask extends BaseController {
180 180 List<ShipmentHeader> shipmentHeaderList = shipmentHeaderService.list(new LambdaQueryWrapper<ShipmentHeader>()
181 181 .eq(ShipmentHeader::getFirstStatus, QuantityConstant.SHIPMENT_HEADER_COMPLETED)
182 182 .eq(ShipmentHeader::getLastStatus, QuantityConstant.SHIPMENT_HEADER_COMPLETED)
  183 + .lt(ShipmentHeader::getPushErrorCount, 4)
183 184 .eq(ShipmentHeader::getPushSuccessStatus, BigDecimal.ZERO.intValue()));
184 185 for (ShipmentHeader shipmentHeader : shipmentHeaderList) {
185 186 //299：其他出库
... ... @@ -198,6 +199,7 @@ public class RyTask extends BaseController {
198 199 //199：其它入库
199 200 receiptLambdaQueryWrapper.eq(ReceiptHeader::getReceiptType, "199")
200 201 .eq(ReceiptHeader::getFirstStatus, QuantityConstant.RECEIPT_HEADER_POSTING)
  202 + .lt(ReceiptHeader::getPushErrorCount, 4)
201 203 .eq(ReceiptHeader::getLastStatus, QuantityConstant.RECEIPT_HEADER_POSTING);
202 204 List<ReceiptHeader> receiptHeaderList = receiptHeaderService.list(receiptLambdaQueryWrapper);
203 205 for (ReceiptHeader receiptHeader : receiptHeaderList) {
... ... @@ -236,6 +238,7 @@ public class RyTask extends BaseController {
236 238 //入库回传
237 239 LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
238 240 taskHeaderLambdaQueryWrapper.eq(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED)
  241 + .lt(TaskHeader::getPushErrorCount, 4)
239 242 .in(TaskHeader::getTaskType, QuantityConstant.TASK_TYPE_WHOLERECEIPT, QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT)
240 243 .eq(TaskHeader::getBackMoM, 0);
241 244 List<TaskHeader> taskHeaderList = taskHeaderService.list(taskHeaderLambdaQueryWrapper);
... ...
src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
  View file @4a581bc
... ... @@ -583,9 +583,9 @@ public class ShipmentHeaderController extends BaseController {
583 583 if (shipmentHeader == null) {
584 584 return AjaxResult.error("没有找到出库单");
585 585 }
586   - shipmentHeader.setFirstStatus(QuantityConstant.SHIPMENT_HEADER_RETURN);
587   - shipmentHeader.setLastStatus(QuantityConstant.SHIPMENT_HEADER_RETURN);
588   - shipmentHeaderService.updateById(shipmentHeader);
  586 + //shipmentHeader.setFirstStatus(QuantityConstant.SHIPMENT_HEADER_RETURN);
  587 + //shipmentHeader.setLastStatus(QuantityConstant.SHIPMENT_HEADER_RETURN);
  588 + //shipmentHeaderService.updateById(shipmentHeader);
589 589 return AjaxResult.success("回传成功");
590 590 }
591 591  
... ...
src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java
  View file @4a581bc
... ... @@ -30,6 +30,7 @@ import com.huaheng.pc.config.location.domain.Location;
30 30 import com.huaheng.pc.config.material.service.MaterialService;
31 31 import com.huaheng.pc.config.warehouse.domain.Warehouse;
32 32 import com.huaheng.pc.inventory.cycleCountDetail.domain.CycleCountDetail;
  33 +import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
33 34 import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
34 35 import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
35 36 import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
... ... @@ -100,6 +101,7 @@ public class TaskHeaderController extends BaseController {
100 101 .eq(StringUtils.isNotEmpty(taskHeader.getContainerCode()),TaskHeader::getContainerCode,taskHeader.getContainerCode())
101 102 .eq(StringUtils.isNotEmpty(taskHeader.getFromLocation()),TaskHeader::getFromLocation,taskHeader.getFromLocation())
102 103 .eq(StringUtils.isNotEmpty(taskHeader.getToLocation()),TaskHeader::getToLocation,taskHeader.getToLocation())
  104 + .eq(StringUtils.isNotNull(taskHeader.getBackMoM()),TaskHeader::getBackMoM,taskHeader.getBackMoM())
103 105 .eq(StringUtils.isNotEmpty(taskHeader.getZoneCode()),TaskHeader::getZoneCode,taskHeader.getZoneCode())
104 106 .like(StringUtils.isNotEmpty(taskHeader.getCreatedBy()),TaskHeader::getCreatedBy,taskHeader.getCreatedBy())
105 107 .eq(StringUtils.isNotNull(taskHeader.getPriority()),TaskHeader::getPriority,taskHeader.getPriority())
... ...
src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java
  View file @4a581bc
... ... @@ -384,4 +384,12 @@ public class TaskHeader implements Serializable {
384 384 @ApiModelProperty(value="任务完成时间")
385 385 private Date completeTime;
386 386  
  387 +
  388 + /**
  389 + * 回传错误次数
  390 + */
  391 + @TableField(value = "pushErrorCount")
  392 + @ApiModelProperty(value = "回传错误次数")
  393 + public Integer pushErrorCount;
  394 +
387 395 }
... ...
src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskService.java
  View file @4a581bc
... ... @@ -597,11 +597,13 @@ public class ReceiptTaskService {
597 597 receiptHeader.setLastStatus(QuantityConstant.RECEIPT_HEADER_RETURN);
598 598 }
599 599 taskHeader.setBackMoM(1);
600   - taskHeaderService.updateById(taskHeader);
601 600 }else {
  601 + taskHeader.setPushErrorCount(taskHeader.getPushErrorCount()+1);
  602 + taskHeader.setBackMoM(3);
602 603 receiptHeader.setErrorMsg(returnInfo.getMsg());
603 604 receiptHeader.setPushSuccessStatus(2);
604 605 }
  606 + taskHeaderService.updateById(taskHeader);
605 607 receiptHeaderService.updateById(receiptHeader);
606 608 }
607 609 }
... ...
src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
  View file @4a581bc
... ... @@ -371,9 +371,9 @@
371 371 // actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
372 372 actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
373 373 }
374   - // if (row.firstStatus == 500 && row.lastStatus == 500) {
375   - // actions.push('<a class="btn btn-info btn-xs ' + '" href="#" onclick="backERP(\''+row.id+'\')"><i class="fa fa-upload"></i>回传</a>');
376   - // }
  374 + if (row.firstStatus == 500 && row.lastStatus == 500) {
  375 + actions.push('<a class="btn btn-info btn-xs ' + '" href="#" onclick="backERP(\''+row.id+'\')"><i class="fa fa-upload"></i>回传</a>');
  376 + }
377 377 return actions.join('');
378 378 }
379 379 },
... ...
src/main/resources/templates/task/taskHeader/taskHeader.html
  View file @4a581bc
... ... @@ -47,6 +47,13 @@
47 47 <li>
48 48 任务下达人：<input type="text" name="createdBy"/>
49 49 </li>
  50 + <li>
  51 + 回传状态：<select id="backMoM" name="backMoM">
  52 + <option value="">所有</option>
  53 + <option value="0">未回传</option>
  54 + <option value="1">回传成功</option>
  55 + <option value="2">回传失败</option>
  56 + </select>
50 57 <li class="time" style="height: 30px">
51 58 <label>创建时间： </label>
52 59 <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin" autocomplete="off"/>
... ... @@ -292,6 +299,31 @@
292 299 title : '任务完成人',
293 300 visible:true,
294 301 },
  302 +
  303 + {
  304 + field: 'backMoM',
  305 + title: '回传状态',
  306 + visible:true,
  307 + align: 'center',
  308 + formatter: function(value, row, index) {
  309 + console.log(row)
  310 + if(value!=undefined){
  311 + if(value==1){
  312 + return '<span style="color:#016201">回传成功</span>'
  313 + }else if(value==0){
  314 + return '<span style="color:#060d37">未回传</span>'
  315 + }else if(value==3){
  316 + return '<span style="color:#b90e0e">回传失败</span>'
  317 + }
  318 + }
  319 + return '';
  320 + }
  321 + },
  322 + {
  323 + field : 'pushErrorCount',
  324 + title : '回传次数',
  325 + visible:true,
  326 + },
295 327 {
296 328 field : 'userDef1',
297 329 title : '自定义字段1' ,
... ...