From 1674f2b873da35814f5f1bdd199b0b37d5d04a3b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 23 十月 2025 09:07:31 +0800
Subject: [PATCH] 最新版本541200007
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 68 +++++++++++++++++++++++++++++++++-
server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/request/WmsOrderPlatformInfoRequest.java | 4 +
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java | 4 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 4 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/WmsService.java | 3 +
admin/src/components/business/OperaPlatformWindow.vue | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java | 6 ++
admin/src/views/platform/components/WaybillDetail.vue | 3 +
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java | 7 +++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java | 11 +++++
11 files changed, 102 insertions(+), 12 deletions(-)
diff --git a/admin/src/components/business/OperaPlatformWindow.vue b/admin/src/components/business/OperaPlatformWindow.vue
index 617e97b..fa05b68 100644
--- a/admin/src/components/business/OperaPlatformWindow.vue
+++ b/admin/src/components/business/OperaPlatformWindow.vue
@@ -84,7 +84,7 @@
startTime: '',
endTime: '',
workingNum: 1,
- 鍚屾椂浣滀笟鏁伴噺: 0,
+ callReadyNum: 0,
ledContent: '',
workRate: '',
stayTimeoutAlarmTime: '',
diff --git a/admin/src/views/platform/components/WaybillDetail.vue b/admin/src/views/platform/components/WaybillDetail.vue
index 4cbabfa..4aac767 100644
--- a/admin/src/views/platform/components/WaybillDetail.vue
+++ b/admin/src/views/platform/components/WaybillDetail.vue
@@ -38,11 +38,12 @@
<span class="pad" v-if="item.lockStatus == 0">鐢靛瓙閿佹湭涓婇攣</span>
<!-- </div> -->
</div>
- <div class="placeholder6">鏀惰揣鍦帮細{{ item.address }}</div>
+ <div class="placeholder6" v-if="info && info.type === 1">鏀惰揣鍦帮細{{ item.address }}</div>
<div class="list">
<div class="line" v-for="line in item.platformWmsDetailList">
<div class="left"><span>鐗╂枡鍚嶇О锛�</span><span>{{ line.materialName }}</span></div>
<div class="right"><span>鏁伴噺锛�</span><span>{{ line.ioQty }}涓囨敮</span></div>
+ <div class="right" v-if="info && info.type === 0"><span>渚涘簲鍟嗭細</span><span>{{ line.inRepertotyCode }} / {{ line.inRepertotyName }}</span></div>
</div>
</div>
</div>
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index c1cd8a1..ae89d84 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -1,6 +1,9 @@
package com.doumee.core.utils;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -20,6 +23,7 @@
public class Constants {
public static final String HEADER_USER_TOKEN = "dm_user_token";
public static final String REDIS_TOKEN_KEY = "token_";
+ public static final String WMS_IN_REPERTOTY_CODE_LIST = "WMS_IN_REPERTOTY_CODE_LIST";
public static final String REDIS_HK_TOKEN_KEY = "hk_token_";
public static boolean IS_AUTOCALL_WORKING = false;
public static final String HK_TOKEN_VALIDITY = "HK_TOKEN_VALIDITY";
@@ -717,7 +721,67 @@
}
}
+ public static String getWmsAreasNameByCode(String listStr,String code) {
+ try {
+ JSONArray list = JSONObject.parseArray(listStr );
+ if(list!=null && list.size()>0){
+ for (int i = 0; i < list.size(); i++) {
+ if(StringUtils.equals(list.getJSONObject(i).getString("code"),code)){
+ return list.getJSONObject(i).getString("name");
+ }
+ }
+ }
+ }catch (Exception e){
+
+ }
+ return null;
+ }
+ public static List<JSONObject> getWmsAreasList(){
+ List<JSONObject> list = new ArrayList<>();
+ JSONObject t = new JSONObject();
+ t.put("code","01");
+ t.put("name","铓屽煚鑿寸儫鍘�");
+ list.add(t);
+ t = new JSONObject();
+ t.put("code","02");
+ t.put("name","鑺滄箹鍗风儫鍘�");
+ list.add(t);
+ t = new JSONObject();
+ t.put("code","03");
+ t.put("name","鍚堣偉鍗风儫鍘�");
+ list.add(t);
+ t = new JSONObject();
+ t.put("code","04");
+ t.put("name","闃滈槼鍗风儫鍘�");
+ list.add(t);
+ t = new JSONObject();
+ t.put("code","04206");
+ t.put("name","鍚堣偉鍗风儫鍘傞瀺灞卞簱");
+ list.add(t);
+ t = new JSONObject();
+ t.put("code","05");
+ t.put("name","婊佸窞鍗风儫鍘�");
+ list.add(t);
+ t = new JSONObject();
+ t.put("code","06");
+ t.put("name","钂欏煄棣欒寗鐢熶骇閮�");
+ list.add(t);
+ t = new JSONObject();
+ t.put("code","07");
+ t.put("name","閲嶅簡涓儫宸ヤ笟鏈夐檺璐ｄ换鍏徃");
+ list.add(t);
+ t = new JSONObject();
+ t.put("code","08");
+ t.put("name","闄曡タ涓儫宸ヤ笟鏈夐檺璐ｄ换鍏徃");
+ list.add(t);
+ t = new JSONObject();
+ t.put("code","09");
+ t.put("name","鐗规畩绾康鐗�");
+ list.add(t);
+ return list;
+ }
public static void main(String[] args) {
+ System.out.println(JSONObject.toJSONString(getWmsAreasList()));
// getChinesePingyin("DDaa姹熻悕鐨勫瀵瑰");
// System.out.println(DateUtil.getShortTime(new Date()));
// System.out.println( "2025-01-14 10:50:56".substring(0,10));
@@ -725,8 +789,8 @@
// System.out.println(Constants.getVehiclePlateNo("婀楤140D17").getDescription());
// System.out.println(Constants.getVehiclePlateNo("瀹緼P0637").getDescription());
- System.out.println( "{\"data\":{\"paramValues\":{\"accessType\":\"2\",\"certTypes\":\"111\",\"certificateNos\":\"340122199904297373\",\"defineEventType\":\"771760131\",\"eventId\":\"6eb4a18bf3744c4385adb37eecdc9d37_634acece3fcf0_3d87\",\"eventType\":\"541200060\",\"eventTypeName\":\"\",\"extEventCardNo\":\"\",\"extEventPictureURL\":\"/pic?9d9c568c1a2do-4el*71-871o9=1524*7l9=0507*3607416=7147*=t212**ps5=2*8b9=559838d9837371-b162of-5pi2dc3=88=20c\",\"extEventReaderID\":\"\",\"extEventReaderKind\":\"\",\"gateIndex\":\"fc92c663ffb9420994f2574469f35e2d\",\"gateName\":\"瀹夋嘲瑗块棬\",\"happenTime\":\"2025-05-09T13:06:13.000+08:00\",\"inOrOut\":\"0\",\"invoicesIds\":\"9857A54DAD5947EDB032575ECDD9EA4Bf4ebb8b61e344cd09118bfbdb5ff285c\",\"parkIndex\":\"1c4cdb8b66ed4c23bacb385c3fb6c46b\",\"parkName\":\"鍋滆溅鍦篭",\"phones\":\"19956520776\",\"plateNos\":\"鐨朅AA1652\",\"srcIndex\":\"6eb4a18bf3744c4385adb37eecdc9d37\",\"srcName\":\"\",\"srcParentIndex\":\"\",\"srcType\":\"roadway\",\"svrIndexCode\":\"eae18a71-1ffd-4e72-bcf6-998c5977630d\",\"userType\":\"\",\"visitorNames\":\"淇炴壃\"},\"targetPerson\":{\"certType\":\"111\",\"createTime\":\"2024-08-19T17:43:09.966+08:00\",\"jobNo\":\"18055162696\",\"mobile\":\"18055162696\",\"name\":\"鏈变箣钀孿",\"orgId\":\"d815b989-877a-40e7-8f34-a5388295a3d2\",\"orgPathName\":\"瀹夋嘲鐗╂祦鍥尯/瀹夋嘲鐗╂祦/缁煎悎绠＄悊绉慭",\"personId\":\"1d8d42233bce4722a741917de4195084\",\"personNumber\":\"18055162696\",\"pinyin\":\"zhuzhimeng\",\"sex\":\"1\",\"updateTime\":\"2025-05-09T11:20:42.000+08:00\",\"userName\":\"18055162696\"},\"visitorInformationList\":[{\"appointmentCode\":\"947384\",\"cardNo\":\"6206767065588\",\"certNo\":\"340122199904297373\",\"certType\":111,\"companionPerson\":\"0\",\"createTime\":\"2025-05-09T13:04:26.740+08:00\",\"faceUrl\":\"2ffa5b542ec2448f9033e6901b326f44\",\"phone\":\"19956520776\",\"plateNo\":\"鐨朅AA1652\",\"sex\":1,\"unit\":\"瀹夊窘涓滅櫨淇濆畨鏈嶅姟鏈夐檺鍏徃\",\"updateTime\":\"2025-05-09T13:05:36.472+08:00\",\"visitNum\":\"0\",\"visitorId\":\"6424f11498de48228fb2a418d3fc3bb1\",\"visitorName\":\"淇炴壃\"}],\"visitorInvoices\":{\"appointmentType\":\"3\",\"authIssueStatus\":\"1\",\"beginTime\":\"2025-05-09T13:01:00.000+08:00\",\"campusId\":\"root000000\",\"campusName\":\"榛樿鍥尯\",\"createTime\":\"2025-05-09T13:04:26.693+08:00\",\"extendJson\":\"\",\"finishTime\":\"2025-05-09T14:01:00.000+08:00\",\"ifInfoAbnormal\":\"0\",\"invoicesId\":\"9857A54DAD5947EDB032575ECDD9EA4Bf4ebb8b61e344cd09118bfbdb5ff285c\",\"invoicesNo\":\"FK20250509130002\",\"invoicesStatus\":\"1\",\"isRepast\":\"0\",\"type\":\"0\",\"updateTime\":\"2025-05-09T13:05:30.372+08:00\",\"visitReason\":\"-1\",\"visitReasonName\":\"鍏朵粬\",\"visitTargetId\":\"1d8d42233bce4722a741917de4195084\",\"workflowInitiatorId\":\"6424f11498de48228fb2a418d3fc3bb1\",\"workflowInitiatorType\":\"0\",\"workflowInstanceId\":\"7010a8521de54f088331e7176b82fd10\"}},\"eventId\":\"b5024c7b6c8b4b5587baf42dc5bce025\",\"eventType\":541200060,\"happenTime\":\"2025-05-09T13:06:14+08:00\",\"srcIndex\":\"9857A54DAD5947EDB032575ECDD9EA4Bf4ebb8b61e344cd09118bfbdb5ff285c\",\"srcType\":\"9857A54DAD5947EDB032575ECDD9EA4Bf4ebb8b61e344cd09118bfbdb5ff285c\",\"status\":0,\"timeout\":0}");
- System.out.println("{\"data\":{\"paramValues\":{\"accessType\":\"2\",\"certTypes\":\"111\",\"certificateNos\":\"340122199904297373\",\"defineEventType\":\"771760134\",\"eventId\":\"6cf8a9b5cb614bddb74f338701975ade_634ad693b6b33_3db4\",\"eventType\":\"541200060\",\"eventTypeName\":\"\",\"extEventCardNo\":\"\",\"extEventPictureURL\":\"/pic?9d9c568c1a2do-4el*81-891*9o3=5563*4l0=0206706794t6=318**ps==515b*=5698*8d9835393-b9667f-1pi1dco=852c2=083\",\"extEventReaderID\":\"\",\"extEventReaderKind\":\"\",\"gateIndex\":\"fc92c663ffb9420994f2574469f35e2d\",\"gateName\":\"瀹夋嘲瑗块棬\",\"happenTime\":\"2025-05-09T13:40:59.000+08:00\",\"inOrOut\":\"1\",\"invoicesIds\":\"9857A54DAD5947EDB032575ECDD9EA4Bf4ebb8b61e344cd09118bfbdb5ff285c\",\"parkIndex\":\"1c4cdb8b66ed4c23bacb385c3fb6c46b\",\"parkName\":\"鍋滆溅鍦篭",\"phones\":\"19956520776\",\"plateNos\":\"鐨朅AA1652\",\"srcIndex\":\"6cf8a9b5cb614bddb74f338701975ade\",\"srcName\":\"\",\"srcParentIndex\":\"\",\"srcType\":\"roadway\",\"svrIndexCode\":\"eae18a71-1ffd-4e72-bcf6-998c5977630d\",\"userType\":\"\",\"visitorNames\":\"淇炴壃\"},\"targetPerson\":{\"certType\":\"111\",\"createTime\":\"2024-08-19T17:43:09.966+08:00\",\"jobNo\":\"18055162696\",\"mobile\":\"18055162696\",\"name\":\"鏈变箣钀孿",\"orgId\":\"d815b989-877a-40e7-8f34-a5388295a3d2\",\"orgPathName\":\"瀹夋嘲鐗╂祦鍥尯/瀹夋嘲鐗╂祦/缁煎悎绠＄悊绉慭",\"personId\":\"1d8d42233bce4722a741917de4195084\",\"personNumber\":\"18055162696\",\"pinyin\":\"zhuzhimeng\",\"sex\":\"1\",\"updateTime\":\"2025-05-09T11:20:42.000+08:00\",\"userName\":\"18055162696\"},\"visitorInformationList\":[{\"appointmentCode\":\"947384\",\"cardNo\":\"6206767065588\",\"certNo\":\"340122199904297373\",\"certType\":111,\"companionPerson\":\"0\",\"createTime\":\"2025-05-09T13:04:26.740+08:00\",\"faceUrl\":\"2ffa5b542ec2448f9033e6901b326f44\",\"phone\":\"19956520776\",\"plateNo\":\"鐨朅AA1652\",\"sex\":1,\"unit\":\"瀹夊窘涓滅櫨淇濆畨鏈嶅姟鏈夐檺鍏徃\",\"updateTime\":\"2025-05-09T13:05:36.472+08:00\",\"visitNum\":\"0\",\"visitorId\":\"6424f11498de48228fb2a418d3fc3bb1\",\"visitorName\":\"淇炴壃\"}],\"visitorInvoices\":{\"appointmentType\":\"3\",\"authIssueStatus\":\"1\",\"beginTime\":\"2025-05-09T13:01:00.000+08:00\",\"campusId\":\"root000000\",\"campusName\":\"榛樿鍥尯\",\"createTime\":\"2025-05-09T13:04:26.693+08:00\",\"extendJson\":\"\",\"finishTime\":\"2025-05-09T14:01:00.000+08:00\",\"ifInfoAbnormal\":\"0\",\"invoicesId\":\"9857A54DAD5947EDB032575ECDD9EA4Bf4ebb8b61e344cd09118bfbdb5ff285c\",\"invoicesNo\":\"FK20250509130002\",\"invoicesStatus\":\"5\",\"isRepast\":\"0\",\"type\":\"0\",\"updateTime\":\"2025-05-09T13:41:00.369+08:00\",\"visitReason\":\"-1\",\"visitReasonName\":\"鍏朵粬\",\"visitTargetId\":\"1d8d42233bce4722a741917de4195084\",\"workflowInitiatorId\":\"6424f11498de48228fb2a418d3fc3bb1\",\"workflowInitiatorType\":\"0\",\"workflowInstanceId\":\"7010a8521de54f088331e7176b82fd10\"}},\"eventId\":\"2bb6700a9e4f48849227100243f470b2\",\"eventType\":541200060,\"happenTime\":\"2025-05-09T13:41:00+08:00\",\"srcIndex\":\"9857A54DAD5947EDB032575ECDD9EA4Bf4ebb8b61e344cd09118bfbdb5ff285c\",\"srcType\":\"9857A54DAD5947EDB032575ECDD9EA4Bf4ebb8b61e344cd09118bfbdb5ff285c\",\"status\":0,\"timeout\":0}");
+// System.out.println( "{\"data\":{\"paramValues\":{\"accessType\":\"2\",\"certTypes\":\"111\",\"certificateNos\":\"340122199904297373\",\"defineEventType\":\"771760131\",\"eventId\":\"6eb4a18bf3744c4385adb37eecdc9d37_634acece3fcf0_3d87\",\"eventType\":\"541200060\",\"eventTypeName\":\"\",\"extEventCardNo\":\"\",\"extEventPictureURL\":\"/pic?9d9c568c1a2do-4el*71-871o9=1524*7l9=0507*3607416=7147*=t212**ps5=2*8b9=559838d9837371-b162of-5pi2dc3=88=20c\",\"extEventReaderID\":\"\",\"extEventReaderKind\":\"\",\"gateIndex\":\"fc92c663ffb9420994f2574469f35e2d\",\"gateName\":\"瀹夋嘲瑗块棬\",\"happenTime\":\"2025-05-09T13:06:13.000+08:00\",\"inOrOut\":\"0\",\"invoicesIds\":\"9857A54DAD5947EDB032575ECDD9EA4Bf4ebb8b61e344cd09118bfbdb5ff285c\",\"parkIndex\":\"1c4cdb8b66ed4c23bacb385c3fb6c46b\",\"parkName\":\"鍋滆溅鍦篭",\"phones\":\"19956520776\",\"plateNos\":\"鐨朅AA1652\",\"srcIndex\":\"6eb4a18bf3744c4385adb37eecdc9d37\",\"srcName\":\"\",\"srcParentIndex\":\"\",\"srcType\":\"roadway\",\"svrIndexCode\":\"eae18a71-1ffd-4e72-bcf6-998c5977630d\",\"userType\":\"\",\"visitorNames\":\"淇炴壃\"},\"targetPerson\":{\"certType\":\"111\",\"createTime\":\"2024-08-19T17:43:09.966+08:00\",\"jobNo\":\"18055162696\",\"mobile\":\"18055162696\",\"name\":\"鏈变箣钀孿",\"orgId\":\"d815b989-877a-40e7-8f34-a5388295a3d2\",\"orgPathName\":\"瀹夋嘲鐗╂祦鍥尯/瀹夋嘲鐗╂祦/缁煎悎绠＄悊绉慭",\"personId\":\"1d8d42233bce4722a741917de4195084\",\"personNumber\":\"18055162696\",\"pinyin\":\"zhuzhimeng\",\"sex\":\"1\",\"updateTime\":\"2025-05-09T11:20:42.000+08:00\",\"userName\":\"18055162696\"},\"visitorInformationList\":[{\"appointmentCode\":\"947384\",\"cardNo\":\"6206767065588\",\"certNo\":\"340122199904297373\",\"certType\":111,\"companionPerson\":\"0\",\"createTime\":\"2025-05-09T13:04:26.740+08:00\",\"faceUrl\":\"2ffa5b542ec2448f9033e6901b326f44\",\"phone\":\"19956520776\",\"plateNo\":\"鐨朅AA1652\",\"sex\":1,\"unit\":\"瀹夊窘涓滅櫨淇濆畨鏈嶅姟鏈夐檺鍏徃\",\"updateTime\":\"2025-05-09T13:05:36.472+08:00\",\"visitNum\":\"0\",\"visitorId\":\"6424f11498de48228fb2a418d3fc3bb1\",\"visitorName\":\"淇炴壃\"}],\"visitorInvoices\":{\"appointmentType\":\"3\",\"authIssueStatus\":\"1\",\"beginTime\":\"2025-05-09T13:01:00.000+08:00\",\"campusId\":\"root000000\",\"campusName\":\"榛樿鍥尯\",\"createTime\":\"2025-05-09T13:04:26.693+08:00\",\"extendJson\":\"\",\"finishTime\":\"2025-05-09T14:01:00.000+08:00\",\"ifInfoAbnormal\":\"0\",\"invoicesId\":\"9857A54DAD5947EDB032575ECDD9EA4Bf4ebb8b61e344cd09118bfbdb5ff285c\",\"invoicesNo\":\"FK20250509130002\",\"invoicesStatus\":\"1\",\"isRepast\":\"0\",\"type\":\"0\",\"updateTime\":\"2025-05-09T13:05:30.372+08:00\",\"visitReason\":\"-1\",\"visitReasonName\":\"鍏朵粬\",\"visitTargetId\":\"1d8d42233bce4722a741917de4195084\",\"workflowInitiatorId\":\"6424f11498de48228fb2a418d3fc3bb1\",\"workflowInitiatorType\":\"0\",\"workflowInstanceId\":\"7010a8521de54f088331e7176b82fd10\"}},\"eventId\":\"b5024c7b6c8b4b5587baf42dc5bce025\",\"eventType\":541200060,\"happenTime\":\"2025-05-09T13:06:14+08:00\",\"srcIndex\":\"9857A54DAD5947EDB032575ECDD9EA4Bf4ebb8b61e344cd09118bfbdb5ff285c\",\"srcType\":\"9857A54DAD5947EDB032575ECDD9EA4Bf4ebb8b61e344cd09118bfbdb5ff285c\",\"status\":0,\"timeout\":0}");
+// System.out.println("{\"data\":{\"paramValues\":{\"accessType\":\"2\",\"certTypes\":\"111\",\"certificateNos\":\"340122199904297373\",\"defineEventType\":\"771760134\",\"eventId\":\"6cf8a9b5cb614bddb74f338701975ade_634ad693b6b33_3db4\",\"eventType\":\"541200060\",\"eventTypeName\":\"\",\"extEventCardNo\":\"\",\"extEventPictureURL\":\"/pic?9d9c568c1a2do-4el*81-891*9o3=5563*4l0=0206706794t6=318**ps==515b*=5698*8d9835393-b9667f-1pi1dco=852c2=083\",\"extEventReaderID\":\"\",\"extEventReaderKind\":\"\",\"gateIndex\":\"fc92c663ffb9420994f2574469f35e2d\",\"gateName\":\"瀹夋嘲瑗块棬\",\"happenTime\":\"2025-05-09T13:40:59.000+08:00\",\"inOrOut\":\"1\",\"invoicesIds\":\"9857A54DAD5947EDB032575ECDD9EA4Bf4ebb8b61e344cd09118bfbdb5ff285c\",\"parkIndex\":\"1c4cdb8b66ed4c23bacb385c3fb6c46b\",\"parkName\":\"鍋滆溅鍦篭",\"phones\":\"19956520776\",\"plateNos\":\"鐨朅AA1652\",\"srcIndex\":\"6cf8a9b5cb614bddb74f338701975ade\",\"srcName\":\"\",\"srcParentIndex\":\"\",\"srcType\":\"roadway\",\"svrIndexCode\":\"eae18a71-1ffd-4e72-bcf6-998c5977630d\",\"userType\":\"\",\"visitorNames\":\"淇炴壃\"},\"targetPerson\":{\"certType\":\"111\",\"createTime\":\"2024-08-19T17:43:09.966+08:00\",\"jobNo\":\"18055162696\",\"mobile\":\"18055162696\",\"name\":\"鏈变箣钀孿",\"orgId\":\"d815b989-877a-40e7-8f34-a5388295a3d2\",\"orgPathName\":\"瀹夋嘲鐗╂祦鍥尯/瀹夋嘲鐗╂祦/缁煎悎绠＄悊绉慭",\"personId\":\"1d8d42233bce4722a741917de4195084\",\"personNumber\":\"18055162696\",\"pinyin\":\"zhuzhimeng\",\"sex\":\"1\",\"updateTime\":\"2025-05-09T11:20:42.000+08:00\",\"userName\":\"18055162696\"},\"visitorInformationList\":[{\"appointmentCode\":\"947384\",\"cardNo\":\"6206767065588\",\"certNo\":\"340122199904297373\",\"certType\":111,\"companionPerson\":\"0\",\"createTime\":\"2025-05-09T13:04:26.740+08:00\",\"faceUrl\":\"2ffa5b542ec2448f9033e6901b326f44\",\"phone\":\"19956520776\",\"plateNo\":\"鐨朅AA1652\",\"sex\":1,\"unit\":\"瀹夊窘涓滅櫨淇濆畨鏈嶅姟鏈夐檺鍏徃\",\"updateTime\":\"2025-05-09T13:05:36.472+08:00\",\"visitNum\":\"0\",\"visitorId\":\"6424f11498de48228fb2a418d3fc3bb1\",\"visitorName\":\"淇炴壃\"}],\"visitorInvoices\":{\"appointmentType\":\"3\",\"authIssueStatus\":\"1\",\"beginTime\":\"2025-05-09T13:01:00.000+08:00\",\"campusId\":\"root000000\",\"campusName\":\"榛樿鍥尯\",\"createTime\":\"2025-05-09T13:04:26.693+08:00\",\"extendJson\":\"\",\"finishTime\":\"2025-05-09T14:01:00.000+08:00\",\"ifInfoAbnormal\":\"0\",\"invoicesId\":\"9857A54DAD5947EDB032575ECDD9EA4Bf4ebb8b61e344cd09118bfbdb5ff285c\",\"invoicesNo\":\"FK20250509130002\",\"invoicesStatus\":\"5\",\"isRepast\":\"0\",\"type\":\"0\",\"updateTime\":\"2025-05-09T13:41:00.369+08:00\",\"visitReason\":\"-1\",\"visitReasonName\":\"鍏朵粬\",\"visitTargetId\":\"1d8d42233bce4722a741917de4195084\",\"workflowInitiatorId\":\"6424f11498de48228fb2a418d3fc3bb1\",\"workflowInitiatorType\":\"0\",\"workflowInstanceId\":\"7010a8521de54f088331e7176b82fd10\"}},\"eventId\":\"2bb6700a9e4f48849227100243f470b2\",\"eventType\":541200060,\"happenTime\":\"2025-05-09T13:41:00+08:00\",\"srcIndex\":\"9857A54DAD5947EDB032575ECDD9EA4Bf4ebb8b61e344cd09118bfbdb5ff285c\",\"srcType\":\"9857A54DAD5947EDB032575ECDD9EA4Bf4ebb8b61e344cd09118bfbdb5ff285c\",\"status\":0,\"timeout\":0}");
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java
index 667f14a..6879864 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java
@@ -199,7 +199,7 @@
if(!Constants.equalsInteger(platformJob.getType(),Constants.FOUR)
&& StringUtils.isNotBlank(platformJob.getBillCode())){
//閫氱煡WMS缁戝畾鏈堝彴淇℃伅
- wmsService.orderPlatformBind(platformJob);
+ wmsService.orderPlatformBind(platformJob,1);
}
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -221,6 +221,11 @@
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
PlatformJob platformJob = platformJobService.platformOverNumber(jobOperateDTO);
platformJobService.cancelInPark(platformJob);
+ if(Constants.equalsInteger(platformJob.getOrigin(),Constants.ONE)
+ && StringUtils.isNotBlank(platformJob.getBillCode())){
+ //閫氱煡WMS缁戝畾鏈堝彴淇℃伅
+ wmsService.orderPlatformBind(platformJob,0);
+ }
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java
index 0671e49..4917afb 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java
@@ -126,7 +126,7 @@
if(!Constants.equalsInteger(platformJob.getType(),Constants.FOUR)
&& StringUtils.isNotBlank(platformJob.getBillCode())){
//閫氱煡WMS缁戝畾鏈堝彴淇℃伅
- wmsService.orderPlatformBind(platformJob);
+ wmsService.orderPlatformBind(platformJob,1);
}
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/request/WmsOrderPlatformInfoRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/request/WmsOrderPlatformInfoRequest.java
index 1700d25..57c22ca 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/request/WmsOrderPlatformInfoRequest.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/request/WmsOrderPlatformInfoRequest.java
@@ -15,6 +15,8 @@
public class WmsOrderPlatformInfoRequest extends WmsBaseRequest {
@ApiModelProperty(value = "閫氱煡鍗曞彿" ,example = "1")
private String carrierBillCode;
- @ApiModelProperty(value = "鏈堝彴缂栧彿" ,example = "1")
+ @ApiModelProperty(value = "鏈堝彴缂栧彿锛坥ptionType==1鏃跺繀濉級" ,example = "1")
private String railwayNo;
+ @ApiModelProperty(value = "缁戝畾绫诲瀷 0娓呯┖ 1缁戝畾 " ,example = "1")
+ private int optionType;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java
index 231133d..8333a5a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java
@@ -103,7 +103,9 @@
@ApiModelProperty(value = "鎵胯繍鍗曞彿", example = "1")
@TableField(exist = false)
private String carryBillCode;
-
+ @ApiModelProperty(value = "渚涘簲鍟嗗悕绉�", example = "1")
+ @TableField(exist = false)
+ private String inRepertotyName;
@ApiModelProperty(value = "鍚堝悓鍙穈")
@ExcelColumn(name="鍚堝悓鍙穈")
private String contractNum;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
index c130195..3c6ffe3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
@@ -2775,7 +2775,7 @@
if(!Constants.equalsInteger(platformJob.getType(),Constants.FOUR)
&& StringUtils.isNotBlank(platformJob.getBillCode())){
//閫氱煡WMS缁戝畾鏈堝彴淇℃伅
- wmsService.orderPlatformBind(platformJob);
+ wmsService.orderPlatformBind(platformJob,1);
}
}catch (Exception e){
log.error("鏈堝彴鑷姩鍙彿鏉冮檺涓嬪彂澶辫触锛歿}"+JSONObject.toJSONString(platformJob));
@@ -2892,7 +2892,7 @@
if(!Constants.equalsInteger(platformJob.getType(),Constants.FOUR)
&& StringUtils.isNotBlank(platformJob.getBillCode())){
//閫氱煡WMS缁戝畾鏈堝彴淇℃伅
- wmsService.orderPlatformBind(platformJob);
+ wmsService.orderPlatformBind(platformJob,1);
}
}catch (Exception e){
log.error("鑷姩鍙彿鍏ュ洯鏉冮檺涓嬪彂澶辫触锛歿}"+JSONObject.toJSONString(platformJob));
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java
index 5753f76..ed86b04 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java
@@ -1,5 +1,7 @@
package com.doumee.service.business.impl;
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.biz.system.SystemUserBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.service.business.third.model.PageData;
@@ -37,6 +39,8 @@
@Autowired
private PlatformWmsJobMapper platformWmsJobMapper;
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
@Autowired
private PlatformWmsDetailMapper platformWmsDetailMapper;
@@ -96,12 +100,19 @@
if(Objects.isNull(platformWmsJob)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈煡璇㈠埌杩愬崟淇℃伅");
}
+ String codeStr =systemDictDataBiz.queryByCode(Constants.WMS_PARAM, Constants.WMS_IN_REPERTOTY_CODE_LIST).getCode();
List<PlatformWmsDetail> platformWmsDetailList = platformWmsDetailMapper.selectList(new QueryWrapper<PlatformWmsDetail>()
.lambda().eq(PlatformWmsDetail::getJobId,id).eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO));
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformWmsDetailList)){
platformWmsJob.setIoQty(
platformWmsDetailList.stream().map(m->m.getIoQty()).reduce(BigDecimal.ZERO,BigDecimal::add)
);
+ for(PlatformWmsDetail d :platformWmsDetailList){
+ if(StringUtils.isNotBlank(d.getInRepertotyCode())){
+ //渚涘簲鍟嗗悕绉�
+ d.setInRepertotyName(Constants.getWmsAreasNameByCode(codeStr,d.getInRepertotyCode()));
+ }
+ }
//鑾峰彇鎵�鏈夊悎鍚屽彿(鍘婚噸锛�
List<String> ioCodeList = platformWmsDetailList.stream().map(m->m.getContractNum()).distinct().collect(Collectors.toList());
Set<String> ioCodeSet = new HashSet<String>(ioCodeList);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
index 03f044d..31126ab 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
@@ -83,7 +83,7 @@
* @return
*/
@Override
- public WmsBaseResponse<WmsBaseDataResponse> orderPlatformBind(PlatformJob job) {
+ public WmsBaseResponse<WmsBaseDataResponse> orderPlatformBind(PlatformJob job,int optType) {
if(StringUtils.isBlank(job.getBillCode()) || StringUtils.isBlank(job.getPlatformWmsCode())){
return null;
}
@@ -106,6 +106,9 @@
String url = type == 0?systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.WMS_INBOUND_PLATFROM_URL).getCode():
systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.WMS_OUTBOUND_PLATFROM_URL).getCode();;
String name = type ==0?"銆怶MS銆戝叆搴撲綔涓氬崟鍒嗛厤鏈堝彴":"銆怶MS銆戝嚭搴撲綔涓氱殑鍒嗛厤鏈堝彴";
+ if(optType == 1){
+ name = type ==0?"銆怶MS銆戝叆搴撲綔涓氬崟娓呯┖鏈堝彴":"銆怶MS銆戝嚭搴撲綔涓氱殑娓呯┖鏈堝彴";
+ }
// int sendSuccess = 0;
// int sendError = 0;
List<String> errorMassge = new ArrayList<>();
@@ -120,6 +123,7 @@
WmsOrderPlatformInfoRequest o = new WmsOrderPlatformInfoRequest();
o.setCarrierBillCode(platformWmsDetail.getIocode());
o.setRailwayNo(job.getPlatformWmsCode());
+ o.setOptionType(optType);
param.getData().add(o);
response = sendHttpRequest(url,name,JSONObject.toJSONString(param),new TypeReference< WmsBaseResponse<WmsBaseDataResponse>>(){});
if(response!=null && response.getData() !=null
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/WmsService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/WmsService.java
index 4e145db..56e2a30 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/WmsService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/WmsService.java
@@ -21,8 +21,9 @@
/**
* 鍑哄叆搴撲綔涓氬垎閰嶆湀鍙�
* @return WmsBaseResponse
+ * @param optionType 0娓呯┖ 1瑙ｇ粦
*/
- WmsBaseResponse orderPlatformBind(PlatformJob job);
+ WmsBaseResponse orderPlatformBind(PlatformJob job,int optionType);
WmsBaseResponse<WmsBaseDataResponse> getInventoryList();
void saveInterfaceLog(String url,String name,String param,Integer success,String respone,int type);
/**
--
Gitblit v1.9.3