入库任务和出库单失败后手动回传

易文鹏
1 parent ebe60db4
Showing 8 changed files with 149 additions and 13 deletions
src/main/java/com/huaheng/api/mes/controller/MesReceiptController.java
src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
src/main/java/com/huaheng/pc/shipment/shipmentHeaderHistory/controller/ShipmentHeaderHistoryController.java
src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java
src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskService.java
src/main/resources/templates/shipment/shipmentHeaderHistory/shipmentHeaderHistory.html
src/main/resources/templates/task/taskHeader/taskHeader.html
@@ -626,7 +626,7 @@ public class MesReceiptController extends BaseController {
             shipmentHeader.setErrorMsg("出库回传：接口地址错误或返回为空");
             shipmentHeader.setPushSuccessStatus(2);
             shipmentHeaderService.updateById(shipmentHeader);
-            return true;
+            return false;
         }
         shipmentHeader.setPushErrorCount(shipmentHeader.getPushErrorCount()+1);
         if (!returnInfo.hasError()) {
@@ -436,17 +436,19 @@ public class RyTask extends BaseController {
     public void gcBill(){
  
         LambdaQueryWrapper<ReceiptHeader> query = Wrappers.lambdaQuery();
-        query.eq(ReceiptHeader::getFirstStatus,QuantityConstant.RECEIPT_HEADER_RETURN)
+        query   .eq(ReceiptHeader::getFirstStatus,QuantityConstant.RECEIPT_HEADER_RETURN)
                 .eq(ReceiptHeader::getLastStatus,QuantityConstant.RECEIPT_HEADER_RETURN)
+                .eq(ReceiptHeader::getPushSuccessStatus,1)
                 .eq(ReceiptHeader::getDeleted, true)
-                .last("LIMIT 10");
+                .last("LIMIT 1");
         List<ReceiptHeader> receiptHeaders = receiptHeaderService.list(query);
  
         LambdaQueryWrapper<ShipmentHeader> query1 = Wrappers.lambdaQuery();
-        query1.eq(ShipmentHeader::getLastStatus,QuantityConstant.RECEIPT_HEADER_RETURN)
+        query1  .eq(ShipmentHeader::getFirstStatus,QuantityConstant.RECEIPT_HEADER_RETURN)
                 .eq(ShipmentHeader::getLastStatus,QuantityConstant.RECEIPT_HEADER_RETURN)
+                .eq(ShipmentHeader::getPushSuccessStatus,1)
                 .eq(ShipmentHeader::getDeleted, false)
-                .last("LIMIT 10");
+                .last("LIMIT 1");
         List<ShipmentHeader> shipmentHeaders = shipmentHeaderService.list(query1);
  
         for (ReceiptHeader receiptHeader : receiptHeaders) {
@@ -477,6 +479,51 @@ public class RyTask extends BaseController {
         }
     }
  
+    public void gcBill2(){
+        LambdaQueryWrapper<ReceiptHeader> query = Wrappers.lambdaQuery();
+        query.eq(ReceiptHeader::getFirstStatus,QuantityConstant.RECEIPT_HEADER_POSTING)
+                .eq(ReceiptHeader::getLastStatus,QuantityConstant.RECEIPT_HEADER_POSTING)
+                .eq(ReceiptHeader::getDeleted, true)
+                .last("LIMIT 1");
+        List<ReceiptHeader> receiptHeaders = receiptHeaderService.list(query);
+
+        LambdaQueryWrapper<ShipmentHeader> query1 = Wrappers.lambdaQuery();
+        query1.eq(ShipmentHeader::getLastStatus,QuantityConstant.SHIPMENT_HEADER_COMPLETED)
+                .eq(ShipmentHeader::getLastStatus,QuantityConstant.SHIPMENT_HEADER_COMPLETED)
+                .eq(ShipmentHeader::getDeleted, false)
+                .last("LIMIT 1");
+        List<ShipmentHeader> shipmentHeaders = shipmentHeaderService.list(query1);
+
+
+        for (ReceiptHeader receiptHeader : receiptHeaders) {
+            try{
+                //新增入库单历史
+                receiptHeaderHistoryService.saveById(String.valueOf(receiptHeader.getId()), "回传");
+                receiptHeader.setDeleted(false);
+                if (!receiptHeaderService.updateById(receiptHeader)) {
+                    throw new ServiceException("删除头表失败");
+                }
+            }catch (Exception e){
+                e.printStackTrace();
+            }
+        }
+
+        for (ShipmentHeader shipmentHeader : shipmentHeaders) {
+            try{
+                //新增入库单历史
+                shipmentHeaderHistoryService.saveById(String.valueOf(shipmentHeader.getId()), "回传");
+                shipmentHeader.setDeleted(true);
+                if (!shipmentHeaderService.updateById(shipmentHeader)) {
+                    throw new ServiceException("删除头表失败");
+                }
+            }catch (Exception e){
+                e.printStackTrace();
+            }
+
+        }
+    }
+
+
     public void restoreHistoryDate(){
         receiptRestore();
         shipmentRestore();
@@ -583,10 +583,22 @@ public class ShipmentHeaderController extends BaseController {
         if (shipmentHeader == null) {
             return AjaxResult.error("没有找到出库单");
         }
-        //shipmentHeader.setFirstStatus(QuantityConstant.SHIPMENT_HEADER_RETURN);
-        //shipmentHeader.setLastStatus(QuantityConstant.SHIPMENT_HEADER_RETURN);
-        //shipmentHeaderService.updateById(shipmentHeader);
-        return AjaxResult.success("回传成功");
+        if (shipmentHeader.getPushSuccessStatus()!=2) {
+            return AjaxResult.error("只有回传错误才能手动回传！");
+        }
+        if (("MOM".equals(shipmentHeader.getCreatedBy()) || "merge".equals(shipmentHeader.getShipmentType()) || "299".equals(shipmentHeader.getShipmentType()))) {
+            try {
+                shipmentHeader.setWarehouse("035");
+                if (mesReceiptController.postE_Rd_Out(shipmentHeader)) {
+                    return AjaxResult.success("回传成功");
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }else {
+            return AjaxResult.error("无需回传");
+        }
+        return AjaxResult.error("回传失败");
     }
  
  
@@ -64,13 +64,14 @@ public class ShipmentHeaderHistoryController extends BaseController
 	@Log(title = "出库-出库单历史", operating="查看历史出库主单", action = BusinessType.GRANT)
 	@PostMapping("/list")
 	@ResponseBody
-	public TableDataInfo list(ShipmentHeaderHistory shipmentHeader, String createdBegin, String createdEnd, String deliveryDate, String startDate) {
+	public TableDataInfo list(ShipmentHeaderHistory shipmentHeader, String createdBegin, String createdEnd, String deliveryDate, String startDate,String importDate) {
 		LambdaQueryWrapper<ShipmentHeaderHistory> lambdaQueryWrapper = Wrappers.lambdaQuery();
 		PageDomain pageDomain = TableSupport.buildPageRequest();
 		Integer pageNum = pageDomain.getPageNum();
 		Integer pageSize = pageDomain.getPageSize();
 		Date date1 = null;
 		Date date2 = null;
+		Date date3 = null;
 		try {
 			if (StringUtils.isNotNull(deliveryDate)) {
 				date1 = new SimpleDateFormat("yyyy-MM-dd").parse(deliveryDate);
@@ -89,7 +90,14 @@ public class ShipmentHeaderHistoryController extends BaseController
 			}
 		} catch (java.text.ParseException e) {
 		}
-
+		try {
+			if (StringUtils.isNotNull(importDate)) {
+				date3 = new SimpleDateFormat("yyyy-MM-dd").parse(importDate);
+			} else {
+				date3 = null;
+			}
+		} catch (java.text.ParseException e) {
+		}
 		Date startTime1 = date1;
 		Date endTime1 = null;
 		if(startTime1!=null){
@@ -103,6 +111,12 @@ public class ShipmentHeaderHistoryController extends BaseController
 			//获取当前时间
 			endTime2 = DateUtils.dateAddNum(startTime2, 1,0,-1);
 		}
+		Date startTime3 = date3;
+		Date endTime3 = null;
+		if (startTime3 != null) {
+			//获取当前时间
+			endTime3 = DateUtils.dateAddNum(startTime3, 1, 0, -1);
+		}
  
 		lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),ShipmentHeaderHistory::getCreated, createdBegin)
 				.le(StringUtils.isNotEmpty(createdEnd), ShipmentHeaderHistory::getCreated, createdEnd)
@@ -117,11 +131,14 @@ public class ShipmentHeaderHistoryController extends BaseController
 				.like(StringUtils.isNotEmpty(shipmentHeader.getShipmentNote()), ShipmentHeaderHistory::getShipmentNote, shipmentHeader.getShipmentNote())
 				.like(StringUtils.isNotEmpty(shipmentHeader.getWorkshop()),ShipmentHeaderHistory::getWorkshop,shipmentHeader.getWorkshop())
 				.eq(StringUtils.isNotEmpty(shipmentHeader.getShipmentType()),ShipmentHeaderHistory::getShipmentType,shipmentHeader.getShipmentType())
+				.like(StringUtils.isNotEmpty(shipmentHeader.getProcessType()), ShipmentHeaderHistory::getProcessType, shipmentHeader.getProcessType())
 				.eq(StringUtils.isNotEmpty(shipmentHeader.getReferCode()), ShipmentHeaderHistory::getReferCode, shipmentHeader.getReferCode())
+				.like(StringUtils.isNotEmpty(shipmentHeader.getTransferWarehouseName()), ShipmentHeaderHistory::getTransferWarehouseName, shipmentHeader.getTransferWarehouseName())
 				.eq(StringUtils.isNotEmpty(shipmentHeader.getReferCodeType()), ShipmentHeaderHistory::getReferCodeType, shipmentHeader.getReferCodeType())
 				.like(StringUtils.isNotEmpty(shipmentHeader.getOrigin()), ShipmentHeaderHistory::getOrigin, shipmentHeader.getOrigin())
 				.between(StringUtils.isNotNull(startTime1), ShipmentHeaderHistory::getRequestedDeliveryDate, startTime1,endTime1)
 				.between(StringUtils.isNotNull(startTime2), ShipmentHeaderHistory::getRequestedStartDate, startTime2,endTime2)
+				.between(StringUtils.isNotNull(startTime3), ShipmentHeaderHistory::getDailyScheduleImportDate, startTime3, endTime3)
 				.eq(shipmentHeader.getFirstStatus()!=null, ShipmentHeaderHistory::getFirstStatus, shipmentHeader.getFirstStatus())
 				.eq(shipmentHeader.getLastStatus()!=null, ShipmentHeaderHistory::getLastStatus, shipmentHeader.getLastStatus())
 				.eq(StringUtils.isNotNull(shipmentHeader.getPushSuccessStatus()),ShipmentHeaderHistory::getPushSuccessStatus,shipmentHeader.getPushSuccessStatus())
@@ -35,6 +35,7 @@ import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
 import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
 import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
 import com.huaheng.pc.task.taskHeader.mapper.TaskHeaderMapper;
+import com.huaheng.pc.task.taskHeader.service.ReceiptTaskService;
 import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
 import com.huaheng.pc.task.taskHeader.service.WorkTaskService;
 import io.swagger.annotations.ApiOperation;
@@ -74,6 +75,9 @@ public class TaskHeaderController extends BaseController {
     @Resource
     private ContainerTypeService containerTypeService;
  
+    @Resource
+    private ReceiptTaskService receiptTaskService;
+
  
     private String prefix = "task/taskHeader";
  
@@ -204,6 +208,26 @@ public class TaskHeaderController extends BaseController {
         return taskHeaderService.completeTaskByWMS(Convert.toIntArray(taskId), null);
     }
  
+
+    /**
+     * 回传erp
+     */
+    //@RequiresPermissions("task:taskHeader:complete")
+    //@Log(title = "任务-任务管理", operating = "PC完成立库任务", action = BusinessType.UPDATE)
+    @PostMapping( "/backERP")
+    @ResponseBody
+    public AjaxResult backERP(String taskId){
+        if (StringUtils.isEmpty(taskId)){
+            return AjaxResult.error("taskId不能为空");
+        }
+        TaskHeader taskHeader = taskHeaderService.getById(taskId);
+        if (taskHeader==null) {
+            return AjaxResult.error("找不到该任务"+taskId);
+        }
+        return receiptTaskService.backMomReceipt(taskHeader);
+    }
+
+
     /**
      * 删除立库任务
      */
@@ -602,11 +602,14 @@ public class ReceiptTaskService {
                     taskHeader.setBackMoM(3);
                     receiptHeader.setErrorMsg(returnInfo.getMsg());
                     receiptHeader.setPushSuccessStatus(2);
+                    taskHeaderService.updateById(taskHeader);
+                    receiptHeaderService.updateById(receiptHeader);
+                    return AjaxResult.error("回传失败");
                 }
                 taskHeaderService.updateById(taskHeader);
                 receiptHeaderService.updateById(receiptHeader);
             }
         }
-        return AjaxResult.success("回传MOM成功");
+        return AjaxResult.success("回传成功");
     }
 }
@@ -50,6 +50,12 @@
                                         通知单号：<input type="text" name="noticeNo"/>
                                     </li>
                                     <li>
+                                        调整单号：<input type="text" name="processType"/>
+                                    </li>
+                                    <li>
+                                        调入仓库名称：<input type="text" name="transferWarehouseName"/>
+                                    </li>
+                                    <li>
                                         头 状 态：<select name="firstStatus"
                                                          th:with="firstStatus=${@dict.getType('shipmentHeaderStatus')}">
                                         <option value="">所有</option>
@@ -89,6 +95,11 @@
                                         备注：<input type="text" name="shipmentNote"/>
                                     </li>
                                     <li class="time">
+
+                                        <label>日计划导入日期： </label>
+                                        <input type="text" class="time-input" id="dailyScheduleImportDate"
+                                               placeholder="日计划导入日期"
+                                               name="importDate" autocomplete="off"/>
                                         <label>计划开工日期： </label>
                                         <input type="text" class="time-input" id="requestedStartDate"
                                                placeholder="计划开工日期"
@@ -256,6 +267,15 @@
     var shipmentId = "";
     var shipmentCode = "";
  
+    //日计划导入日期
+    layui.use('laydate', function () {
+        var laydate = layui.laydate;
+        var day1 = new Date();
+        day1.setTime(day1.getTime() + 24 * 60 * 60 * 1000 * 1);
+        // laydate.render({ elem: '#requestedDeliveryDate', theme: 'molv',value: new Date(day1), isInitValue: true});
+        laydate.render({elem: '#dailyScheduleImportDate', theme: 'molv'});
+    });
+
     //计划完工日期
     layui.use('laydate', function () {
         var laydate = layui.laydate;
@@ -402,6 +422,7 @@
                 //         return actions.join('');
                 //     }
                 // },
+
                 {
                     field: 'warehouseCode',
                     title: '仓库',
@@ -160,6 +160,9 @@
 							actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>取消</a> ');
 							actions.push('<a class="btn btn-primary btn-xs ' + completeFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-check"></i>完成</a>');
 						}
+						if (row.status >= 100 && row.backMoM===3) {
+							actions.push('<a class="btn btn-primary btn-xs ' + completeFlag + '" href="#" onclick="backERP(\'' + row.id + '\')"><i class="fa fa-check"></i>回传</a>');
+						}
 						return actions.join('');
 					}
 				},
@@ -321,7 +324,7 @@
 				},
 				{
 					field : 'pushErrorCount',
-					title : '回传次数',
+					title : '回传错误次数',
 					visible:true,
 				},
 				{
@@ -555,6 +558,15 @@
 		});
 	}
  
+	/*任务列表-回传*/
+	function backERP(taskId) {
+		$.modal.confirm("确定回传MOM？", function() {
+			var url = ctx + 'task/taskHeader/backERP';
+			var data = { "taskId" : taskId };
+			$.operate.post(url, data);
+		});
+	}
+
 	/*任务列表-批量完成任务*/
 	function batchComplete() {
 		//var rows = $.common.isEmpty($.table._option.taskId) ? $.table.selectFirstColumns() : $.table.selectColumns($.table._option.taskId);