From a54991d9a7116ab541264816a80520a49cdebdcd Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 25 十二月 2024 14:17:24 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 7 ++-
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderNoFinishListResponse.java | 63 +++++++++++++++++++------------
server/system_service/src/main/java/com/doumee/dao/timer/scheduler/QuartzManage.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java | 2
4 files changed, 45 insertions(+), 29 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/dao/timer/scheduler/QuartzManage.java b/server/system_service/src/main/java/com/doumee/dao/timer/scheduler/QuartzManage.java
index e0191a9..357ab0f 100644
--- a/server/system_service/src/main/java/com/doumee/dao/timer/scheduler/QuartzManage.java
+++ b/server/system_service/src/main/java/com/doumee/dao/timer/scheduler/QuartzManage.java
@@ -68,7 +68,7 @@
jobDetail.getJobDataMap().put(QuartzJob.JOB_PARAM_KEY,quartzJob);
scheduler.scheduleJob(jobDetail,trigger) ;
// 鐘舵�佹牎楠�
-// checkStop(quartzJob) ;
+ checkStop(quartzJob) ;
} catch (SchedulerException e){
throw new RuntimeException("createJob Fail",e) ;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderNoFinishListResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderNoFinishListResponse.java
index bbe7b40..cff2395 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderNoFinishListResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderNoFinishListResponse.java
@@ -11,30 +11,45 @@
@Data
@ApiModel("tms鏈畬鎴愬悎鍚屽垪琛ㄨ繑鍥炲弬鏁�")
public class TmsOrderNoFinishListResponse {
- @ApiModelProperty(value = "鍒跺崟鏃ユ湡" )
- private String ncCreateDate ;// 瀛楃涓� 鍒跺崟鏃ユ湡 杩斿洖骞存湀鏃ワ紝姣斿锛�2024-07-08
- @ApiModelProperty(value = "宸ュ巶鍚嶇О" )
- private String factoryName;// 瀛楃涓� 宸ュ巶鍚嶇О
- @ApiModelProperty(value = "宸ュ巶缂栫爜" )
- private String factoryCode;// 瀛楃涓� 宸ュ巶缂栫爜
- @ApiModelProperty(value = "杩愯緭鍗曞彿" )
- private String transportCode;// 瀛楃涓� 杩愯緭鍗曞彿
- @ApiModelProperty(value = "杞︾墝鍙�" )
- private String platNumber;// 瀛楃涓� 杞︾墝鍙�
+ @ApiModelProperty(value = "钀ラ攢璁㈠崟缂栫爜" )
+ private String orderNumber;// 瀛楃涓� 钀ラ攢璁㈠崟缂栫爜
@ApiModelProperty(value = "鍚堝悓鍙�" )
- private String contractNumber;// 瀛楃涓� 鍚堝悓鍙�
- @ApiModelProperty(value = "鐘舵�� 0鏈惎杩愶紱1鍦ㄩ�旓紱2鍒拌揣" )
- private String status;// 瀛楃涓� 鐘舵�� 0 鏈惎杩愶紱1 鍦ㄩ�旓紱2 鍒拌揣
- @ApiModelProperty(value = "鍒拌揪鏃堕棿" )
- private String arrivedDate;// 瀛楃涓� 鍒拌揪鏃堕棿
- @ApiModelProperty(value = "鍑哄簱鏃堕棿" )
- private String outDate ;// 瀛楃涓� 鍑哄簱鏃堕棿
- @ApiModelProperty(value = "杩愯緭璁″垝褰㈡垚鏃堕棿" )
- private String transportDate;// 瀛楃涓� 杩愯緭璁″垝褰㈡垚鏃堕棿
- @ApiModelProperty(value = "鏁伴噺(涓囨敮)" )
- private String ncTotality;// 鏁板瓧 鏁伴噺(涓囨敮)
+ private String contractNumber;// 瀛楃涓� 鍚堝悓鍙�
+ @ApiModelProperty(value = "杩愯緭鍗曞彿" )
+ private String transportCode ;//瀛楃涓� 杩愯緭鍗曞彿
+ @ApiModelProperty(value = "杩愯緭杞﹁締" )
+ private String plateNumber;// 瀛楃涓� 杩愯緭杞﹁締
+ @ApiModelProperty(value = "鐘舵��" )
+ private Integer status;// 瀛楃涓� 鐘舵��
+ @ApiModelProperty(value = "鐘舵�佹弿杩�" )
+ private String statusDesc;// 瀛楃涓� 鐘舵��
+ @ApiModelProperty(value = "浠诲姟涓嬭揪鏃堕棿" )
+ private String transportDate;// 瀛楃涓� 浠诲姟涓嬭揪鏃堕棿
+ @ApiModelProperty(value = "璁㈠崟鍒涘缓鏃ユ湡" )
+ private String createDate ;//瀛楃涓� 璁㈠崟鍒涘缓鏃ユ湡
+ @ApiModelProperty(value = "鍙戣揣鍦�" )
+ private String deliveryEnterprise ;//瀛楃涓� 鍙戣揣鍦�
@ApiModelProperty(value = "鍒拌揣鍦�" )
- private String arriveEnterprise;// 瀛楃涓� 鍒拌揣鍦�
- @ApiModelProperty(value = "璁㈠崟绫诲瀷" )
- private String dispatchType ;// 瀛楃涓� 璁㈠崟绫诲瀷
+ private String receiveEnterprise ;//瀛楃涓� 鍒拌揣鍦�
+ @ApiModelProperty(value = "鍙告満濮撳悕" )
+ private String driverName ;//瀛楃涓� 鍙告満濮撳悕
+ @ApiModelProperty(value = "鍙告満鎵嬫満鍙�" )
+ private String driverTel ;//瀛楃涓� 鍙告満鎵嬫満鍙�
+ @ApiModelProperty(value = "棰勮鍒拌揪鏃堕棿" )
+ private String plannedArrivedDate ;//瀛楃涓� 棰勮鍒拌揪鏃堕棿
+ @ApiModelProperty(value = "杩愯緭閲�" )
+ private String totalQty;// 鏁板瓧 杩愯緭閲�
+ @ApiModelProperty(value = "鍙戣揣浠撳簱缁忓害" )
+ private String deliveryLon;// 鏁板瓧 鍙戣揣浠撳簱缁忓害
+ @ApiModelProperty(value = "鍙戣揣浠撳簱缁村害" )
+ private String deliveryLat ;//鏁板瓧 鍙戣揣浠撳簱缁村害
+ @ApiModelProperty(value = "鏀惰揣浠撳簱缁忓害" )
+ private String receiveLon;// 鏁板瓧 鏀惰揣浠撳簱缁忓害
+ @ApiModelProperty(value = "鏀惰揣浠撳簱缁村害" )
+ private String receiveLat;// 鏁板瓧 鏀惰揣浠撳簱缁村害
+ @ApiModelProperty(value = "杞﹁締缁忓害" )
+ private String platLon ;//鏁板瓧 杞﹁締缁忓害
+ @ApiModelProperty(value = "杞﹁締缁忓害" )
+ private String platLat ;//鏁板瓧 杞﹁締缁忓害
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
index 4fa0614..d596c52 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
@@ -747,7 +747,7 @@
//澶勭悊鏂板鏁版嵁
BaseResponse result = HKService.editUser(addHkModel);
if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) ){
- if(StringUtils.isNotBlank(c.getFaceImg()) && Constants.equalsInteger(c.getFaceStatus(),Constants.ZERO)){
+ if(StringUtils.isNotBlank(c.getFaceImg()) && !Constants.equalsInteger(c.getFaceStatus(),Constants.TWO)){
//濡傛灉鏈変汉鑴哥収鐗囷紝澶勭悊浜鸿劯鐓х墖鍚屾
String faceid = dealMemberFace(c,path);
if(StringUtils.isBlank(faceid)){
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index 96369dd..0ba21da 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -1109,10 +1109,11 @@
//濡傛灉鏄湪绾挎垨鑰呬紤鐪狅紝鏌ヨ鍦ㄩ�旇繕鏄┖闂瞭y
codes.add(model.getPlateNum());
model.setJobStatus(Constants.ZERO);
- }else
+ }else{
model.setJobStatus(Constants.TWO);
data.setOfflineNum(data.getOfflineNum()+1);
}
+ }
if(codes.size()>0){
//鐘舵�� 0寰呯‘璁� 1寰呯鍒� 2绛夊緟鍙彿 3鍏ュ洯绛夊緟 4宸插彨鍙� 5浣滀笟涓� 6浣滀笟瀹屾垚 7杞Щ涓� 8寮傚父鎸傝捣 9宸叉巿鏉冪鍥� 10宸茬鍥� 11 宸茶繃鍙� 12鍙栨秷锛圵MS锛�
List<PlatformJob> busyNum = platformJobMapper.selectList(new QueryWrapper<PlatformJob>() .lambda()
@@ -2148,8 +2149,8 @@
for(TmsFactoryParam param : paramList){
if(StringUtils.isNotBlank(factoryCode)){
if(StringUtils.equals(param.getCode(),factoryCode)){
- data.setHoursAbility(data.getHoursAbility().add(Constants.formatBigdecimal(param.getParam3())));
- data.setMaxAbility(data.getMaxAbility().add(Constants.formatBigdecimal(param.getNum2())));
+ data.setHoursAbility(Constants.formatBigdecimal(param.getParam3()));
+ data.setMaxAbility(Constants.formatBigdecimal(param.getNum2()));
code = param.getCode();
break;
}
--
Gitblit v1.9.3