Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/YieldOrderEnum.java

@@ -28,6 +28,7 @@ public enum YieldOrderEnum {
 	STATUS_PROCESS_WAITING("待生产", 10004),
 	STATUS_PROCESSING("加工中", 10005),
 	STATUS_PROCESS_ERROR("排产异常", 10006),
+	STATUS_RECOVER("数据恢复", 10007),
 	STATUS_COMPLETED("已完工", 10015),
 	STATUS_CLOSED("已关闭", 10021),
 

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkOrderController.java

@@ -253,4 +253,14 @@ public class WorkOrderController extends BladeController {
 		return R.success();
 	}
 
+	/**
+	 * 车间订单表 排产
+	 */
+	@GetMapping("/saveWorkOrderFromBak/{cardNo}")
+	@Operation(summary = "恢复老mes数据", description  = "传入WorkOrderDto")
+	public R saveWorkOrderFromBak(@PathVariable String cardNo) {
+		workOrderService.saveWorkOrderFromBak(cardNo);
+		return R.success();
+	}
+
 }

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IWorkOrderService.java

@@ -97,4 +97,12 @@ public interface IWorkOrderService extends BaseService<WorkOrderEntity> {
 	void receiveDispatcherFromOldMes(Long id, Long userId);
 
 	IPage<WorkOrderVO> selectGlassCakeOrderPage(IPage<WorkOrderVO> page, WorkOrderVO workOrder);
+
+
+	/**
+	 * 恢复旧mes数据
+	 *
+	 * @param cardNo
+	 */
+	void saveWorkOrderFromBak(String cardNo);
 }

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java

@@ -98,6 +98,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
     private String oldMesUrl;
     @Value("${business.oldMes.pushApsResult}")
     private String pushApsResult;
+    @Value("${business.oldMes.saveWorkOrderFromBak}")
+    private String saveWorkOrderFromBak;
 
 
     // 定义细粒度锁容器（全局单例）
@@ -229,13 +231,13 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         List<WorkOrderDto> list = baseMapper.selectWorkOrderList(workOrder);
         String yesterday = DateFormatUtils.format(DateUtils.addDays(new Date(),-1),"yyyy-MM-dd");
         String twodaysAgo = DateFormatUtils.format(DateUtils.addDays(new Date(),-2),"yyyy-MM-dd");
-        String threeDaysAgo = DateFormatUtils.format(DateUtils.addDays(new Date(),-3),"YYYY-MM-DD");
+        String threeDaysAgo = DateFormatUtils.format(DateUtils.addDays(new Date(),-3),"yyyy-MM-dd");
         list.forEach(item -> {
-            if((yesterday.equals(item.getReceiveTime()) || twodaysAgo.equals(item.getReceiveTime())) && "1".equals(item.getPlanStatus())){
+            if((yesterday.equals(item.getReceiveTime()) || twodaysAgo.equals(item.getReceiveTime())) && !"5".equals(item.getPlanStatus()) && !"3".equals(item.getPlanStatus())){
                 item.setRemindStatus("1");
             }
             try {
-                if(DateUtils.parseDate(threeDaysAgo,"yyyy-MM-dd").compareTo(DateUtils.parseDate(item.getReceiveTime(),"yyyy-MM-dd")) > 0 && "1".equals(item.getPlanStatus())){
+                if(DateUtils.parseDate(threeDaysAgo,"yyyy-MM-dd").compareTo(DateUtils.parseDate(item.getReceiveTime(),"yyyy-MM-dd")) > 0 && !"5".equals(item.getPlanStatus()) && !"3".equals(item.getPlanStatus())){
                     item.setRemindStatus("2");
                 }
             } catch (ParseException e) {
@@ -1406,4 +1408,26 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         return page.setRecords(baseMapper.selectGlassCakeOrderPage(page, workOrder));
     }
 
+
+    @Override
+    public void saveWorkOrderFromBak(String cardNo) {
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("cardNo",cardNo);
+
+        // 恢复老mes排产数据
+        String url = oldMesUrl + saveWorkOrderFromBak;
+        try {
+            HttpUtil.post(url+"/"+cardNo, paramMap);
+        } catch (Exception e) {
+            log.error("恢复老mes排产数据报错："+e.getMessage());
+            e.printStackTrace();
+        }
+        List<String> cardNoList = Arrays.asList(cardNo.split(","));
+        List<YieldOrderEntity> orderList = yieldOrderService.list(Wrappers.<YieldOrderEntity>lambdaQuery().in(YieldOrderEntity::getCardNo,cardNoList));
+        orderList.forEach(item ->{
+            item.setStatus(YieldOrderEnum.STATUS_RECOVER.getCode());
+            yieldOrderService.updateById(item);
+        });
+    }
+
 }

blade-service/blade-scheduling/src/main/resources/application-dev.yml

@@ -14,3 +14,5 @@ business:
     url: 192.168.169.172:9000
 #    url: 127.0.0.1:32111
     pushApsResult: /zhgd-rb/aiWebapi/receiveApsResult
+    saveWorkOrderFromBak: /zhgd-rb/aiWebapi/saveWorkOrderFromBak
+