From eeb08a586132f489c10e12551c6479b13c9def5e Mon Sep 17 00:00:00 2001
From: Administrator <hbal>
Date: 星期三, 19 四月 2023 08:59:47 +0800
Subject: [PATCH] 明晟、义瑞装车
---
JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java | 6 +++---
JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java b/JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java
index 449409a..c016dfd 100644
--- a/JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java
+++ b/JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java
@@ -162,7 +162,7 @@
" left join nc_hw hw on mx.tdmx_hwbh=hw.pkid and hw.state=1 " ,
" join xs_taskmonitor xt on mx.tdmx_fdywbh = xt.businessNo ",
" join fd_bsheet on bsNo=tdmx_fdywbh and status='鍦ㄥ姙' " ,
- " where SdepartNo=#{sdepartNo} and xt.firstgbtime is not null and xt.lastgbtime is null and zcWc=0"
+ " where SdepartNo=#{sdepartNo} and xt.firstgbtime is not null and xt.lastgbtime is null"
})
public List<Map> getHwList(String sdepartNo);
@@ -172,8 +172,8 @@
"case WHEN EXISTS ( SELECT * FROM bussinessitems WHERE bussinessNo = x.businessNo ) THEN '鍦ㄨ'" ,
" when x.firstgbtime is not null then '寰呰' else '瀹屾垚' end zcStatus " ,
" from xs_taskmonitor x" ,
- " join bussinesssheet bs on x.businessNo=bs.bussinessNo" ,
- " where sdepartNo=#{sdepartNo} and x.lastgbtime is null and zcWc=0"
+ " join bussinesssheet bs on x.businessNo=bs.bussinessNo and bs.sstatus='鍦ㄥ姙' " ,
+ " 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/webservice/service/impl/FdXSTDService.java b/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java
index aea6a42..fed4699 100644
--- a/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java
+++ b/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java
@@ -813,7 +813,7 @@
public void sendToYrLed(String currPch) {
// 鐘舵�� 涓�纾呭悗锛屽緟瑁咃紱PDA鎵爜 鍦ㄨ锛� 浜屾杩囩鍚庢秷澶�
// 瑁呰溅鍖� 涓や釜姹夊瓧鍔犱袱涓嫳鏂囨垨鏁板瓧
- String strTitle="搴忓彿 杞﹀彿 瑁呰溅鍖� 鐘舵�乗r\n";
+ String strTitle="搴忓彿 杞﹀彿 瑁呰溅鍖� 鐘舵�乗r\n";
String strContent = "";
String contentFormatStr = "%s %s %s %s\r\n";
List<Map> list = tdmxper.yRZcList("08");
@@ -823,8 +823,8 @@
String zcWz = (String) map.get("zcWz"); // 瑁呰溅浣嶇疆
if(StringUtils.isNotBlank(zcWz)){
zcWz = zcWz.substring(0,4);
- } else {
- zcWz = " ";
+ } else { // 绌烘槸6涓綅缃�
+ zcWz = " ";
}
String zcStatus = (String) map.get("zcStatus"); // 瑁呰溅浣嶇疆 鍦ㄥ姙/寰呭姙
strContent += String.format(contentFormatStr, fillWithZero(index++), numberplates, zcWz, zcStatus);
--
Gitblit v1.9.3