订单计划管理(版本合并)

op-modules/op-mes/src/main/java/com/op/mes/mapper/ProOrderMapper.java

@@ -10,7 +10,6 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.op.mes.domain.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 
 /**
  * 订单Mapper接口

op-modules/op-mes/src/main/java/com/op/mes/mapper/ProOrderWorkorderMapper.java

@@ -1,7 +1,7 @@
 package com.op.mes.mapper;
 
 import com.op.mes.domain.ProOrderWorkorder;
-import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.Date;
 import java.util.List;
@@ -69,7 +69,6 @@ public interface ProOrderWorkorderMapper {
      * @return
      */
     List<ProOrderWorkorder> selectFirWorkOrder(String id);
-    ProOrderWorkorder selectWorkOrderByCode(String workorderCode);
     /**
      * 通过code查询子工单
      *

op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderServiceImpl.java

@@ -3,7 +3,6 @@ package com.op.mes.service.impl;
 import java.util.*;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.op.common.core.context.SecurityContextHolder;
 import com.op.common.core.utils.DateUtils;
 import com.op.common.core.utils.uuid.IdUtils;
@@ -295,7 +294,7 @@ public class ProOrderServiceImpl implements IProOrderService {
     @DS("#header.poolName")
     public int insertProOrder(ProOrder proOrder) {
         // 获取当前时间
-        Date date = new Date();
+        Date date = DateUtils.getNowDate();
         proOrder.setId(IdUtils.fastSimpleUUID());
         proOrder.setParentOrder("0");
         proOrder.setStatus("o0");
@@ -308,6 +307,11 @@ public class ProOrderServiceImpl implements IProOrderService {
         return proOrderMapper.insertProOrder(proOrder);
     }
 
+    @Override
+    public int insertSapProOrder(ProOrder proOrder) {
+        return 0;
+    }
+
     /**
      * 修改订单
      *
@@ -390,7 +394,7 @@ public class ProOrderServiceImpl implements IProOrderService {
      */
     private ProOrderWorkorder setWorkOrder(ProOrderWorkorder proOrderWorkorder, ProOrder proOrder) {
         // 获取当前时间
-        Date date = new Date();
+        Date date = DateUtils.getNowDate();
         // 订单表更新时间/更新者
         proOrder.setUpdateBy(SecurityContextHolder.getUserName());
         proOrder.setUpdateTime(date);