From 3780c5e65b05bf23020810798babc6d20311fa79 Mon Sep 17 00:00:00 2001
From: hjg <hjg@123.com>
Date: 星期五, 17 十一月 2023 09:53:23 +0800
Subject: [PATCH] 加强回滚限制
---
JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java b/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java
index 3698132..4dff3ec 100644
--- a/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java
+++ b/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java
@@ -415,6 +415,7 @@
prr.setErrmsg("鍙傛暟锛氬崱鍙峰叧鑱旂殑杞︾墝鍙峰拰涓氬姟鍗曞叧鑱旂殑杞︾墝鍙蜂笉涓�鑷�");
return prr;
}
+
// yktywdh = fdb.getBsNo();
int wcnum=this.bsper.getweightDoc(vehicleId, fdb.getBsNo());
@@ -453,7 +454,25 @@
}
// 鐜板満杩囧畬姣涢噸鍚庡嚭鐜版壂鐮佽杞︾殑锛屽繀椤婚噸鏂拌繃纾�
int grossNum=this.bsper.getgrosstDoc(vehicleId, fdb.getBsNo());
-
+ List tdmxPchList = new ArrayList();
+ for (JsonElement je : dataArr) {
+ JsonObject jo=je.getAsJsonObject();
+ String tdmx_pch = jo.get("tdmx_pch").getAsString();
+ tdmxPchList.add(tdmx_pch);
+ }
+ if("08".equals(fdb.getSdepartNo())) { // 鍙槸涔夌憺鍘傚尯鏈夋晥
+ // 妫�鏌ユ槸鍚﹀綋鍓嶅尯鍩熷凡缁忔帓闃�
+ Map paramMap = new HashMap();
+ paramMap.put("vehicleId", vehicleId);
+ paramMap.put("tdmxPchList", tdmxPchList);
+ String jsonStr = Jacksonmethod.tojson(paramMap, false);
+ JsonObject jsonObject = Wxhtmethod.postJsonStr(Contants.yr_canDoScanUrl, jsonStr);
+ if (jsonObject.get("code").getAsInt() != 0) {
+ prr.setCode(1);
+ prr.setErrmsg(jsonObject.get("errmsg").getAsString());
+ return prr;
+ }
+ }
for (JsonElement je : dataArr) {
JsonObject jo=je.getAsJsonObject();
String tdmx_pch = jo.get("tdmx_pch").getAsString();
@@ -614,6 +633,11 @@
if("08".equals(fdb.getSdepartNo())) {
final String cph = currPch;
ThreadPoolUtil.getInstance().execute(()->{
+
+ Map scanCodeParamMap = new HashMap();
+ scanCodeParamMap.put("pch",cph);
+ Wxhtmethod.post(Contants.yr_scanCodeNoticeUrl, scanCodeParamMap);
+
try {
synchronized (FdXSTDService.refreshYrLedLock) {
if (FdXSTDService.refreshYrLedLock) { // 绯荤粺绻佸繖
--
Gitblit v1.9.3