From 0c6a4102012ca052915af778b563670252399ce2 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 30 七月 2025 09:53:39 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/mapper/RgvOneSignMapper.java | 3 +
src/main/java/com/zy/asrs/controller/MonitorController.java | 56 ++++++++++++++++++++++++++--
src/main/resources/mapper/RgvOneSignMapper.xml | 5 ++
3 files changed, 59 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 31e49a4..afcdc17 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -8,8 +8,10 @@
import com.zy.asrs.domain.dto.AxisBean;
import com.zy.asrs.domain.dto.WorkChartAxis;
import com.zy.asrs.domain.vo.LocChartPie;
+import com.zy.asrs.entity.RgvOneSign;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.mapper.ReportQueryMapper;
+import com.zy.asrs.mapper.RgvOneSignMapper;
import com.zy.asrs.mapper.WaitPakinMapper;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.WrkDetlService;
@@ -52,6 +54,8 @@
private WaitPakinMapper waitPakinMapper;
@Autowired
private ApiLogService apiLogService;
+ @Autowired
+ private RgvOneSignMapper rgvOneSignMapper;
/**
* 鑾峰彇褰撳墠鏃堕棿
@@ -72,8 +76,26 @@
} else {
staProtocolPall = staProtocolPall.clone();
}
+ String errorSta = "";
+ boolean signSta = false;
- if (!staProtocolPall.isAutoing() || !staProtocolPall.isLoading() || staProtocolPall.getWorkNo() != 0 || !staProtocolPall.isPakMk()){
+ if (!staProtocolPall.isAutoing()){
+ errorSta = errorSta+"绔欑偣闈炶嚜鍔紒锛侊紒";
+ signSta = true;
+ }
+ if (!staProtocolPall.isLoading()){
+ errorSta = errorSta+"绔欑偣鏃犳墭鐩橈紒锛侊紒";
+ signSta = true;
+ }
+ if (staProtocolPall.getWorkNo() != 0 ){
+ errorSta = errorSta+"绔欑偣瀛樺湪浠诲姟鍙凤紒锛侊紒";
+ signSta = true;
+ }
+ if (!staProtocolPall.isPakMk()){
+ errorSta = errorSta+"绔欑偣瀛樺湪閿佸畾鏍囪锛侊紒锛�";
+ signSta = true;
+ }
+ if (signSta){
try{
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
@@ -82,12 +104,12 @@
null,
null,
JSON.toJSONString(palletizingNo),
- "鏈氨缁紒锛侊紒",
+ "鏈氨缁紒锛侊紒璇风瓑寰�... 鍘熷洜锛�"+errorSta,
false
);
}catch (Exception e){
}
- return R.error("鏈氨缁紒锛侊紒");
+ return R.error("鏈氨缁紒锛侊紒璇风瓑寰�... 鍘熷洜锛�"+errorSta);
}
// 鑾峰彇鏉＄爜鎵弿浠俊鎭�
@@ -140,8 +162,34 @@
);
}catch (Exception e){
}
- return R.error("鏈氨缁紒锛侊紒鎵樼洏鏉＄爜涓嶄负绌轰絾鏄凡瀛樺湪鏁版嵁锛屼笉鍙噸澶嶄娇鐢紒锛侊紒璇锋鏌ワ紒锛侊紒");
+ return R.error("鏈氨缁紒锛侊紒鎵樼洏鏉＄爜涓嶄负绌轰絾鏄凡瀛樺湪鏁版嵁锛屼笉鍙噸澶嶄娇鐢紒锛侊紒璇锋鏌ユ垨閲嶆柊鑾峰彇锛侊紒锛�");
}
+
+
+ RgvOneSign JarTwo = rgvOneSignMapper.selectOneSign(palletizingNo+"barcode"+barcode);
+ if (!Cools.isEmpty(JarTwo)){
+ try{
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ apiLogService.save(
+ "涓帶鐢宠鑾峰彇"+palletizingNo+"绔欑偣褰撳墠鏉＄爜淇℃伅",
+ "/monitor/barcode/two",
+ null,
+ null,
+ JSON.toJSONString(palletizingNo),
+ "鏈氨缁紒锛侊紒鏉＄爜鏇存柊涓�....",
+ false
+ );
+ }catch (Exception e){
+ }
+ return R.error("鏈氨缁紒锛侊紒鏉＄爜鏇存柊涓�....");
+ }
+
+ try{
+ rgvOneSignMapper.deleteBarcode(palletizingNo+"barcode");
+ } catch (Exception e){
+
+ }
+
Cools.CoolMap coolMap = Cools.add("barcode", barcode).add("Date", now);
try{
// 淇濆瓨鎺ュ彛鏃ュ織
diff --git a/src/main/java/com/zy/asrs/mapper/RgvOneSignMapper.java b/src/main/java/com/zy/asrs/mapper/RgvOneSignMapper.java
index 3a0ceea..b248ec0 100644
--- a/src/main/java/com/zy/asrs/mapper/RgvOneSignMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/RgvOneSignMapper.java
@@ -4,7 +4,6 @@
import com.zy.asrs.entity.RgvOneSign;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
@Mapper
@@ -15,4 +14,6 @@
RgvOneSign selectOneSign(@Param("sign") String sign);
+ void deleteBarcode(@Param("prefix") String prefix);
+
}
diff --git a/src/main/resources/mapper/RgvOneSignMapper.xml b/src/main/resources/mapper/RgvOneSignMapper.xml
index 6fe8a58..89453f2 100644
--- a/src/main/resources/mapper/RgvOneSignMapper.xml
+++ b/src/main/resources/mapper/RgvOneSignMapper.xml
@@ -18,4 +18,9 @@
SELECT top 1 * FROM dbo.bas_rgv_one_sign where rgv_one_type=#{sign}
</select>
+ <delete id="deleteBarcode">
+ DELETE FROM dbo.bas_rgv_one_sign
+ WHERE rgv_one_type LIKE CONCAT(#{prefix}, '%')
+ </delete>
+
</mapper>
--
Gitblit v1.9.1