From a966b5abe5fb804464fe1cd09053a03fe94877fd Mon Sep 17 00:00:00 2001
From: hjg <hjg@123.com>
Date: 星期日, 08 十月 2023 12:28:19 +0800
Subject: [PATCH] 义瑞扫码验证
---
JavaSource/com/mandi/fendan/mapper/xmls/Fd_XSTDMapper.xml | 8 +++++---
JavaSource/com/mandi/fendan/util/Contants.java | 4 +++-
JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java | 2 +-
JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java | 24 +++++++++++++++++++++++-
4 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java b/JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java
index c016dfd..859e0c3 100644
--- a/JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java
+++ b/JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java
@@ -173,7 +173,7 @@
" when x.firstgbtime is not null then '寰呰' else '瀹屾垚' end zcStatus " ,
" from xs_taskmonitor x" ,
" join bussinesssheet bs on x.businessNo=bs.bussinessNo and bs.sstatus='鍦ㄥ姙' " ,
- " where sdepartNo=#{sdepartNo} and firstgbtime is not null and x.lastgbtime is null"
+ " where sdepartNo=#{sdepartNo} and firstgbtime is not null and x.lastgbtime is null "
})
public List<Map> yRZcList(String sdepartNo);
diff --git a/JavaSource/com/mandi/fendan/mapper/xmls/Fd_XSTDMapper.xml b/JavaSource/com/mandi/fendan/mapper/xmls/Fd_XSTDMapper.xml
index 3feffd6..1af2336 100644
--- a/JavaSource/com/mandi/fendan/mapper/xmls/Fd_XSTDMapper.xml
+++ b/JavaSource/com/mandi/fendan/mapper/xmls/Fd_XSTDMapper.xml
@@ -99,9 +99,11 @@
</if>
<if test="fdAdmin != null and fdAdmin != '' "> <!-- 鍦ㄨ溅杈嗗垎鍗曢〉闈㈡椂 -->
and (
- (a.td_wfdsl=0 and exists (select 1 from fd_xstdmx tdmx where tdmx.tdmx_tdls = a.td_tdls and
- tdmx.tdmx_gbbz=0 and exists(select 1 from bussinesssheet bs where bussinessNo=tdmx.tdmx_fdywbh
- and cardno is not null and cardno!='') )
+ (a.td_wfdsl=0 and exists
+ (
+ select 1 from fd_xstdmx tdmx where tdmx.tdmx_tdls = a.td_tdls and tdmx.tdmx_gbbz=0 and exists
+ (select 1 from bussinesssheet bs where bussinessNo=tdmx.tdmx_fdywbh and cardno is not null and cardno!='' and sstatus='鍦ㄥ姙')
+ )
) <!-- 鍏ㄩ儴鍒嗗崟锛屽垯杞﹁締鏈夋湭鍙戝崱鏄剧ず -->
or a.td_wfdsl > 0 <!-- 鏈夋湭鍒嗗崟鏄剧ず -->
)
diff --git a/JavaSource/com/mandi/fendan/util/Contants.java b/JavaSource/com/mandi/fendan/util/Contants.java
index 1313f66..98c4b6d 100644
--- a/JavaSource/com/mandi/fendan/util/Contants.java
+++ b/JavaSource/com/mandi/fendan/util/Contants.java
@@ -39,10 +39,12 @@
//鍒嗗崟绯荤粺鎺ㄩ�佷竴鍗￠�氭祴璇曞湴鍧�
- public static String yktLocalAdd = "http://127.0.0.1:8085"; // "http://10.1.1.9:8088";//涓�鍗￠�氬缃戞祴璇曞湴鍧�
+ public static String yktLocalAdd = "http://127.0.0.1:8080"; // "http://10.1.1.9:8088";//涓�鍗￠�氬缃戞祴璇曞湴鍧� todo 鏀逛负8080
public static String msLedServiceAddr = "http://192.168.200.211:8077/APPService.asmx"; // 鏄庢櫉ABC鍖篖ED
public static String yr_zcLedUrl = "http://192.168.200.211:8077/APPService.asmx"; // 涔夌憺LED 瑁呰溅 webservice
+ public static String yr_scanCodeNoticeUrl = yktLocalAdd + "/routine/app/notice/scan.htm"; // 閫氱煡涔夌憺瑁呰溅鐨勬帴鍙�
+ public static String yr_canDoScanUrl = yktLocalAdd + "/routine/app/notice/canDoScan.htm"; // 閫氱煡涔夌憺瑁呰溅鐨勬帴鍙�
// public static String yktLocalAdd="http://125.46.81.106:8088";//涓�鍗￠�氬缃戞祴璇曞湴鍧�
//鍒嗗崟鍥炲啓nc绯荤粺娴嬭瘯鍦板潃NCfdhx_url
public static String NCfdhx_url = "http://10.0.13.20:9088/api/Domain/mtcesb/servlet/PubAPIServlet";
diff --git a/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java b/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java
index 3698132..3a95b46 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,23 @@
}
// 鐜板満杩囧畬姣涢噸鍚庡嚭鐜版壂鐮佽杞︾殑锛屽繀椤婚噸鏂拌繃纾�
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);
+ }
+ // 妫�鏌ユ槸鍚﹀綋鍓嶅尯鍩熷凡缁忔帓闃�
+ 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 +631,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