1.新增定时下载第三方系统基础信息

2.新增定时提交已核对单据

api-admin/src/main/java/com/glxp/api/admin/controller/info/SystemParamConfigController.java

@@ -10,7 +10,6 @@ import com.glxp.api.admin.req.info.SystemParamConfigSaveRequest;
 import com.glxp.api.admin.res.PageSimpleResponse;
 import com.glxp.api.admin.res.info.SystemParamConfigResponse;
 import com.glxp.api.admin.service.info.SystemParamConfigService;
-import com.glxp.api.admin.thread.IoModifyErpTask;
 import com.glxp.api.admin.util.CronUtils;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
@@ -140,6 +139,34 @@ public class SystemParamConfigController {
             } catch (Exception e) {
                 return ResultVOUtils.error(500, "格式错误！");
             }
+        } else if (systemParamConfigSaveRequest.getParamKey().equals("auto_download_thirdSys_data")) {
+            try {
+                int time = 1;
+                if (!"0".equals(systemParamConfigSaveRequest.getParamValue())) {
+                    time = Integer.parseInt(systemParamConfigSaveRequest.getParamValue());
+                }
+                String cornStr = CronUtils.parseHourIntervel(time);
+                ScheduledEntity scheduledEntity = new ScheduledEntity();
+                scheduledEntity.setCron(cornStr);
+                scheduledEntity.setCronName("downThirdSysDataTask");
+                scheduledDao.modifyScheduled(scheduledEntity);
+            } catch (Exception e) {
+                return ResultVOUtils.error(500, "格式错误！");
+            }
+        } else if (systemParamConfigSaveRequest.getParamKey().equals("auto_submit_order")) {
+            try {
+                int time = 1;
+                if (!"0".equals(systemParamConfigSaveRequest.getParamValue())) {
+                    time = Integer.parseInt(systemParamConfigSaveRequest.getParamValue());
+                }
+                String cornStr = CronUtils.parseHourIntervel(time);
+                ScheduledEntity scheduledEntity = new ScheduledEntity();
+                scheduledEntity.setCron(cornStr);
+                scheduledEntity.setCronName("submitOrderTask");
+                scheduledDao.modifyScheduled(scheduledEntity);
+            } catch (Exception e) {
+                return ResultVOUtils.error(500, "格式错误！");
+            }
         }
         return ResultVOUtils.success("修改成功");
     }

api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicThirdSysBusApiDao.java

@@ -27,4 +27,11 @@ public interface BasicThirdSysBusApiDao {
     boolean deleteById(@Param("id") Integer id);
 
     BasicThirdSysBusApiEntity selectByCode(@Param("code") String code);
+
+    /**
+     * 查询所有编码
+     *
+     * @return
+     */
+    List<String> selectAllCode();
 }

api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicThirdSysDao.java

@@ -16,5 +16,11 @@ public interface BasicThirdSysDao {
 
     List<BasicThirdSysEntity> filterBasicThiSys(FilterBasicThirdSysRequest filterBasicThirdSysRequest);
 
+    /**
+     * 查询启用的第三方系统的ID
+     *
+     * @return
+     */
+    List<String> selectEnabledThirdId();
 
 }

api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderDao.java

@@ -58,4 +58,10 @@ public interface StockOrderDao {
     boolean deleteByOrderIdFk(String orderIdFk);
 
     StockOrderEntity findById(@Param("id") String id);
+
+    /**
+     * 查询
+     * @return
+     */
+    List<String> selectWaitSubmitOrders();
 }

api-admin/src/main/java/com/glxp/api/admin/service/inout/OrderService.java

@@ -80,6 +80,7 @@ public interface OrderService {
      * @return
      */
     List<StockOrderResponse> checkSubmitOrder(List<StockOrderResponse> orderResponseList);
+
     /**
      * 查询单据删除页面订单列表
      *
@@ -112,4 +113,12 @@ public interface OrderService {
      * @param orders
      */
     public void getAllOrder(OrderEntity orderEntity, List<OrderEntity> orders);
+
+    /**
+     * 查询待提交订单
+     *
+     * @return
+     */
+    List<String> getWaitSubmitOrder();
+
 }

api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java

@@ -351,6 +351,11 @@ public class OrderServiceImpl implements OrderService {
         return orderResponseList;
     }
 
+    @Override
+    public List<String> getWaitSubmitOrder() {
+        return stockOrderDao.selectWaitSubmitOrders();
+    }
+
 
     @Override
     public List<OrderEntity> filterOrderForDelete(String billNo) {

api-admin/src/main/java/com/glxp/api/admin/util/CronUtils.java

@@ -29,4 +29,13 @@ public class CronUtils {
         return cron;
     }
 
+    public static String parseHourIntervel(int time) {
+        int hour = time;
+        String cron = "0 0 0/" + hour + " * * ?";
+        if (time >= 24) {
+            hour = 24;
+            cron = "0 0 0/" + hour + " * * ?";
+        }
+        return cron;
+    }
 }

api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysBusApiDao.xml

@@ -82,4 +82,9 @@
         from basic_third_sys_bus_api
         where code = #{code}
     </select>
+
+    <select id="selectAllCode" resultType="java.lang.String">
+        select code from basic_third_sys_bus_api
+    </select>
+
 </mapper>

api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml

@@ -41,4 +41,10 @@
     <select id="selectByThirdId" parameterType="Map" resultType="com.glxp.api.admin.entity.basic.BasicThirdSysEntity">
          select * FROM basic_third_sys  WHERE thirdId =  #{thirdId}
     </select>
+
+    <select id="selectEnabledThirdId" resultType="java.lang.String">
+        select thirdId
+        from basic_third_sys
+        where enabled = true
+    </select>
 </mapper>

api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml

@@ -293,4 +293,18 @@
         where orderIdFk = #{orderIdFk}
     </delete>
 
+    <select id="selectWaitSubmitOrders" resultType="java.lang.String">
+        select id
+        from stock_order
+        where billNo in (
+                select erpFk
+                from io_order
+                where erpFk in
+                      (select billNo
+                       from stock_order
+                       where stock_order.billType in (select code from basic_third_sys_bus_api))
+                  and exportStatus = 0
+                )
+    </select>
+
 </mapper>