From 30304784e82d4bba24121328da8eb8490aec4f4f Mon Sep 17 00:00:00 2001
From: hjg <hjg@123.com>
Date: 星期二, 09 七月 2024 18:05:21 +0800
Subject: [PATCH] 更改进厂为待装
---
JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java | 11 +++++++++++
JavaSource/com/mandi/webservice/service/impl/InvoiceService.java | 43 ++++++++++++++++++++++++-------------------
JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java | 4 ++--
3 files changed, 37 insertions(+), 21 deletions(-)
diff --git a/JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java b/JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java
index 12ae025..29738eb 100644
--- a/JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java
+++ b/JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java
@@ -167,6 +167,7 @@
public List<Map> getHwList(String sdepartNo);
/** 涔夌憺銆佺鎶�LED鏄剧ず 搴忓彿 杞﹀彿 瑁呰溅鍖� 鐘舵�� **/
+ @Deprecated
@Select({
"select bs.numberplates,businessNo,zcWz,firstzxhtime," ,
"case WHEN EXISTS ( SELECT * FROM bussinessitems WHERE bussinessNo = x.businessNo ) THEN '鍦ㄨ'" ,
@@ -176,5 +177,15 @@
" where sdepartNo=#{sdepartNo} and firstgbtime is not null and x.lastgbtime is null order by jctime"
})
public List<Map> yRZcList(String sdepartNo);
+ // 涔夌憺銆佺鎶�LED鏄剧ず 绉戞妧杞﹁締杩涘巶鍚庢樉绀虹瓑寰咃紝鎵爜鍚庢樉绀鸿杞︼紝浜屾杩囩鍚庝笉鍐嶆樉绀�
+ @Select({
+ "select bs.numberplates,businessNo,zcWz,firstzxhtime," ,
+ "case WHEN EXISTS ( SELECT * FROM bussinessitems WHERE bussinessNo = x.businessNo ) THEN '瑁呰溅'" ,
+ " when x.jctime 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 jctime is not null and x.lastgbtime is null order by jctime"
+ })
+ public List<Map> kjZcList(String sdepartNo);
}
diff --git a/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java b/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java
index 4376b23..83f1a1f 100644
--- a/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java
+++ b/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java
@@ -918,7 +918,7 @@
String strTitle="搴忓彿 杞﹀彿 瑁呰溅鍖� 鐘舵�乗r\n";
String strContent = "";
String contentFormatStr = "%s %s %s %s\r\n";
- List<Map> list = tdmxper.yRZcList("08");
+ List<Map> list = tdmxper.kjZcList("08");
int index = 1;
for (Map map : list) {
String numberplates = (String) map.get("numberplates"); // 杞︾墝鍙�
@@ -944,7 +944,7 @@
String strTitle="搴忓彿 杞﹀彿 瑁呰溅鍖� 鐘舵�乗r\n";
String strContent = "";
String contentFormatStr = "%s %s %s %s\r\n";
- List<Map> list = tdmxper.yRZcList("04");
+ List<Map> list = tdmxper.kjZcList("04");
int index = 1;
for (Map map : list) {
String numberplates = (String) map.get("numberplates"); // 杞︾墝鍙�
diff --git a/JavaSource/com/mandi/webservice/service/impl/InvoiceService.java b/JavaSource/com/mandi/webservice/service/impl/InvoiceService.java
index c6c5203..6c9d857 100644
--- a/JavaSource/com/mandi/webservice/service/impl/InvoiceService.java
+++ b/JavaSource/com/mandi/webservice/service/impl/InvoiceService.java
@@ -374,18 +374,19 @@
@Override
public String receiveCurrWeight(HttpServletRequest r, String jsonParam) { // 鑾峰彇涓氬姟鍗曞彿 涓�娆＄О閲� 浜屾绉伴噸
- JsonParser jp=new JsonParser();
- JsonObject jo=jp.parse(jsonParam).getAsJsonObject();
+ JsonParser jp = new JsonParser();
+ JsonObject jo = jp.parse(jsonParam).getAsJsonObject();
String businessNo = JSONobj.getstring(jo, "businessNo");
boolean firstWeighing = JSONobj.getbool(jo, "firstWeighing");
boolean secondWeighing = JSONobj.getbool(jo, "secondWeighing");
+ boolean isJc = JSONobj.getbool(jo, "isJc");
String sdepartNo = JSONobj.getstring(jo, "sdepartNo");
- if(StringUtils.isBlank(businessNo) || businessNo.indexOf("XS")!=0 || StringUtils.isBlank(sdepartNo)
+ if (StringUtils.isBlank(businessNo) || businessNo.indexOf("XS") != 0 || StringUtils.isBlank(sdepartNo)
) {
return null;
}
// 鍒锋柊
- if(firstWeighing || secondWeighing) { // 绉伴噸闇�瑕佸埛鏂颁竴涓�
+ if (firstWeighing || secondWeighing) { // 绉伴噸闇�瑕佸埛鏂颁竴涓�
if ("06".equals(sdepartNo)) { // 鏄庢櫉
synchronized (FdXSTDService.refreshMsLedLock) {
if (FdXSTDService.refreshMsLedLock) { // 绯荤粺绻佸繖
@@ -402,7 +403,10 @@
FdXSTDService.refreshMsLedLock = false;
}
}
- } else if ("08".equals(sdepartNo)) { // 涔夌憺
+ }
+ }
+ if (firstWeighing || secondWeighing || isJc) { // 绉伴噸闇�瑕佸埛鏂颁竴涓�
+ if ("08".equals(sdepartNo)) { // 涔夌憺
synchronized (FdXSTDService.refreshYrLedLock) {
if (FdXSTDService.refreshYrLedLock) { // 绯荤粺绻佸繖
return null;
@@ -413,26 +417,27 @@
FdXSTDService.refreshYrLedLock = true;
}
fdser.sendToYrLed(null);
- }finally {
+ } finally {
synchronized (FdXSTDService.refreshYrLedLock) {
FdXSTDService.refreshYrLedLock = false;
}
}
}
- } else if ("04".equals(sdepartNo)) { // 绉戞妧
- synchronized (FdXSTDService.refreshYrLedLock) {
- if (FdXSTDService.refreshKjLedLock) { // 绯荤粺绻佸繖
- return null;
+ if ("04".equals(sdepartNo)) { // 绉戞妧
+ synchronized (FdXSTDService.refreshYrLedLock) {
+ if (FdXSTDService.refreshKjLedLock) { // 绯荤粺绻佸繖
+ return null;
+ }
}
- }
- try {
- synchronized (FdXSTDService.refreshKjLedLock) {
- FdXSTDService.refreshKjLedLock = true;
- }
- fdser.sendToKjLed(null);
- } finally {
- synchronized (FdXSTDService.refreshKjLedLock) {
- FdXSTDService.refreshKjLedLock = false;
+ try {
+ synchronized (FdXSTDService.refreshKjLedLock) {
+ FdXSTDService.refreshKjLedLock = true;
+ }
+ fdser.sendToKjLed(null);
+ } finally {
+ synchronized (FdXSTDService.refreshKjLedLock) {
+ FdXSTDService.refreshKjLedLock = false;
+ }
}
}
}
--
Gitblit v1.9.3