From 4b606ff361a760ce727d709d04a1727a9e0bb3bd Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Fri, 23 Aug 2024 22:38:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0=E9=87=8C?= =?UTF-8?q?=E7=9A=84startTime=E5=92=8CendTime=E4=BF=AE=E6=94=B9=202024?= =?UTF-8?q?=E5=B9=B48=E6=9C=8823=E6=97=A522:38:26?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/kjs/plugin/DeliveryOrderPluginInitializer.java | 2 +- .../frame/plugin/kjs/plugin/MomOrderPluginInitializer.java | 2 +- .../kjs/service/impl/DeliveryOrderPluginServiceImpl.java | 4 ++-- .../plugin/kjs/service/impl/MomOrderPluginServiceImpl.java | 4 ++-- .../hzya/frame/u8/delivery/entity/DeliveryOrderEntity.java | 6 ++++++ .../com/hzya/frame/u8/production/entity/MomOrderEntity.java | 6 ++++++ 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/plugin/DeliveryOrderPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/plugin/DeliveryOrderPluginInitializer.java index 16f180eb..90d2e32c 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/plugin/DeliveryOrderPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/plugin/DeliveryOrderPluginInitializer.java @@ -95,7 +95,7 @@ public class DeliveryOrderPluginInitializer extends PluginBaseEntity { **/ @Override public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception { - logger.info("开始执行"+getPluginName()); + logger.info("开始执行"+getPluginName()+requestJson.toString()); String res = deliveryOrderPluginService.sync2wms(requestJson); return BaseResult.getSuccessMessageEntity("操作成功"); } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/plugin/MomOrderPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/plugin/MomOrderPluginInitializer.java index 18dffa00..6f884e61 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/plugin/MomOrderPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/plugin/MomOrderPluginInitializer.java @@ -96,7 +96,7 @@ public class MomOrderPluginInitializer extends PluginBaseEntity { **/ @Override public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception { - logger.info("开始执行"+getPluginName()); + logger.info("开始执行"+getPluginName()+requestJson.toString()); momOrderPluginService.sync2wms(requestJson); return BaseResult.getSuccessMessageEntity("执行成功"); } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/DeliveryOrderPluginServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/DeliveryOrderPluginServiceImpl.java index 4c4e328e..c065ad6b 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/DeliveryOrderPluginServiceImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/DeliveryOrderPluginServiceImpl.java @@ -52,9 +52,9 @@ public class DeliveryOrderPluginServiceImpl extends KjsPluginBaseService impleme //数据源编码 String datasourceCode = requestJson.getString("sourceCode"); //开始时间 - String startTime = requestJson.getString("startTime"); + String startTime = DateUtil.format(requestJson.getDate("startTime"),"yyyy-MM-dd HH:mm:ss"); //结束时间 - String endTime = requestJson.getString("endTime"); + String endTime = DateUtil.format(requestJson.getDate("endTime"),"yyyy-MM-dd HH:mm:ss"); //1 查询发货单主表 DeliveryOrderEntity orderEntity = new DeliveryOrderEntity(); orderEntity.setDataSourceCode(datasourceCode); diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/MomOrderPluginServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/MomOrderPluginServiceImpl.java index 11f40ac4..177704f7 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/MomOrderPluginServiceImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/MomOrderPluginServiceImpl.java @@ -52,9 +52,9 @@ public class MomOrderPluginServiceImpl extends KjsPluginBaseService implements I //数据源编码 String datasourceCode = requestJson.getString("sourceCode"); //开始时间 - String startTime = requestJson.getString("startTime"); + String startTime = DateUtil.format(requestJson.getDate("startTime"),"yyyy-MM-dd HH:mm:ss"); //结束时间 - String endTime = requestJson.getString("endTime"); + String endTime = DateUtil.format(requestJson.getDate("endTime"),"yyyy-MM-dd HH:mm:ss"); MomOrderEntity entity = new MomOrderEntity(); entity.setDataSourceCode(datasourceCode); diff --git a/service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryOrderEntity.java b/service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryOrderEntity.java index 0d4114cc..d487ffe9 100644 --- a/service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryOrderEntity.java +++ b/service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryOrderEntity.java @@ -1,6 +1,8 @@ package com.hzya.frame.u8.delivery.entity; +import com.fasterxml.jackson.annotation.JsonFormat; import com.hzya.frame.web.entity.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; /** * @Description U8发货单 @@ -44,7 +46,11 @@ public class DeliveryOrderEntity extends BaseEntity { //帐套名 private String dbname; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String startTime;//定时任务执行时传入的开始时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String endTime;//定时任务执行时传入的结束时间 public String getDlid() { diff --git a/service/src/main/java/com/hzya/frame/u8/production/entity/MomOrderEntity.java b/service/src/main/java/com/hzya/frame/u8/production/entity/MomOrderEntity.java index 281af8fd..5b6a4a3a 100644 --- a/service/src/main/java/com/hzya/frame/u8/production/entity/MomOrderEntity.java +++ b/service/src/main/java/com/hzya/frame/u8/production/entity/MomOrderEntity.java @@ -1,6 +1,8 @@ package com.hzya.frame.u8.production.entity; +import com.fasterxml.jackson.annotation.JsonFormat; import com.hzya.frame.web.entity.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; /** * @Description u8生产订单表头 mom_order @@ -26,7 +28,11 @@ public class MomOrderEntity extends BaseEntity { private String pushFlagField; //帐套名 private String dbname; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String startTime;//定时任务执行时传入的开始时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String endTime;//定时任务执行时传入的结束时间 public String getMoId() { return moId;