From 8980782bebfd40b2a56169e4fb53686882e87a97 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期五, 26 十二月 2025 14:20:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 31 ++++++++++++---
src/main/resources/mapper/BasArmMastMapper.xml | 22 ++++++++++-
src/main/java/com/zy/asrs/service/BasArmMastService.java | 2 +
src/main/java/com/zy/asrs/mapper/BasArmMastMapper.java | 2 +
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 4 +
src/main/java/com/zy/asrs/service/impl/BasArmMastServiceImpl.java | 10 +++++
6 files changed, 61 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/BasArmMastMapper.java b/src/main/java/com/zy/asrs/mapper/BasArmMastMapper.java
index cc103e7..87bf25d 100644
--- a/src/main/java/com/zy/asrs/mapper/BasArmMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasArmMastMapper.java
@@ -15,4 +15,6 @@
Double selectOrderDetlAndSku(@Param("orderNo")String orderNo, @Param("matnr")String matnr);
OrderDetlValueResultUtil selectOrderDetlValue(@Param("orderNo")String orderNo, @Param("matnr")String matnr);
Double selectBasArmMastSignValue(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("bindingTags")Long bindingTags);
+ Integer selectCountAndBindingTags(@Param("armNo")int armNo,@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("bindingTags")Long bindingTags);
+ Integer selectCountAndBindingTagsLog(@Param("armNo")int armNo,@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("bindingTags")Long bindingTags);
}
diff --git a/src/main/java/com/zy/asrs/service/BasArmMastService.java b/src/main/java/com/zy/asrs/service/BasArmMastService.java
index 0062637..246dd56 100644
--- a/src/main/java/com/zy/asrs/service/BasArmMastService.java
+++ b/src/main/java/com/zy/asrs/service/BasArmMastService.java
@@ -10,5 +10,7 @@
Double selectOrderDetlAndSku(String order,String matnr);
OrderDetlValueResultUtil selectOrderDetlValue(String order, String matnr);
Double selectBasArmMastSignValue(String order, String matnr,Long bindingTags);
+ Integer selectCountAndBindingTags(int armNo,String order, String matnr,Long bindingTags);
+ Integer selectCountAndBindingTagsLog(int armNo,String order, String matnr,Long bindingTags);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasArmMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasArmMastServiceImpl.java
index 991ae36..419402c 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasArmMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasArmMastServiceImpl.java
@@ -29,4 +29,14 @@
public Double selectBasArmMastSignValue(String order, String matnr,Long bindingTags){
return this.baseMapper.selectBasArmMastSignValue(order,matnr,bindingTags);
}
+
+ @Override
+ public Integer selectCountAndBindingTags(int armNo,String order, String matnr,Long bindingTags){
+ return this.baseMapper.selectCountAndBindingTags(armNo,order,matnr,bindingTags);
+ }
+
+ @Override
+ public Integer selectCountAndBindingTagsLog(int armNo,String order, String matnr,Long bindingTags){
+ return this.baseMapper.selectCountAndBindingTagsLog(armNo,order,matnr,bindingTags);
+ }
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index d059e25..e305d9d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1180,7 +1180,7 @@
//mark - 3 - ....
this.locToLoc(crn, crnProtocol,mark);
//棰勮皟搴�
- this.crnRebackHp(crn, crnProtocol, crnThread);
+// this.crnRebackHp(crn, crnProtocol, crnThread);
}
// News.infoNoLog(""+mark+" - 0"+" - 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂鎵ц瀹屾垚");
@@ -1198,9 +1198,7 @@
new EntityWrapper<BasCrnp>().eq("crn_no", crnProtocol.getCrnNo())
);
boolean result = true;
- if(crnProtocol.getCrnNo() != 5 ){
- return;
- }
+
for (CrnSlave.CrnStn crnStn : slave.getCrnInStn()) {
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
if(crnStn.getStaNo() == 4001){
@@ -1220,8 +1218,8 @@
int x=1;
switch (crnProtocol.getCrnNo()){
case 1: x =2; break;
- case 2: x =6; break;
- case 3: x =11; break;
+ case 2: x =7; break;
+ case 3: x =10; break;
case 4: x =14; break;
case 5: x =18; break;
}
@@ -5122,7 +5120,7 @@
new EntityWrapper<BasArmMast>()
.eq("status", 2)
.eq("binding_tags", basArmMast.getBindingTags()));
- if (binding_tags<2){
+ if (binding_tags==1){
BasArmMast basArmMastOne = basArmMastService.selectOne(
new EntityWrapper<BasArmMast>()
.eq("status", 2)
@@ -5133,6 +5131,25 @@
continue;
}
+ } else if (binding_tags == 0){
+ boolean signBinding_tags_barcode = false;
+ List<BasArmMast> binding_tags_barcodeList = basArmMastService.selectList(
+ new EntityWrapper<BasArmMast>()
+ .eq("barcode", barcode));
+ for (BasArmMast basArmMastBarcode : binding_tags_barcodeList){
+ Integer selectCountAndBindingTags = basArmMastService.selectCountAndBindingTags(basArmMastBarcode.getArmNo(), basArmMastBarcode.getOrderNo(), basArmMastBarcode.getMatnr(),basArmMastBarcode.getBindingTags());
+ Integer selectCountAndBindingTagsLog = basArmMastService.selectCountAndBindingTagsLog(basArmMastBarcode.getArmNo(),basArmMastBarcode.getOrderNo(), basArmMastBarcode.getMatnr(),basArmMastBarcode.getBindingTags());
+
+ Double anfmeSignOne = basArmMastService.selectBasArmMastSignValue(basArmMastBarcode.getOrderNo(), basArmMastBarcode.getMatnr(),basArmMastBarcode.getBindingTags());
+ if ((selectCountAndBindingTags + selectCountAndBindingTagsLog) != anfmeSignOne.intValue()) {
+// signBinding_tags_barcode = true; /////
+ break;
+ }
+ }
+ if (signBinding_tags_barcode){
+ armTaskAssignmentCallApiLogSave(staProtocol, "鏁版嵁寮傚父锛侊紒锛�", staProtocol.getSiteId()+"鐮佸灈浣嶇疆锛屼笂涓�涓垎鎷ｇ粍鏈叏閮ㄥ畬鎴愶紒锛侊紒", false);
+ continue;
+ }
}
}
// OrderDetlValueResultUtil orderDetlValueResultUtil = basArmMastService.selectOrderDetlValue(basArmMast.getOrderNo(), basArmMast.getMatnr());
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 0114b65..2dc0858 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -84,7 +84,7 @@
add(2022);add(2024);
add(2028);add(2030);
add(2025);add(2027);
- add(2031);add(2033);
+ add(2031);add(2032);add(2033);
add(2034);add(2035);add(2037);
// add(2041);add(2042);add(2043);add(2044);
// add(2045);add(2046);add(2047);add(2048);
@@ -613,7 +613,9 @@
boolean[] status1 = siemensS7Net.getByteTransform().TransBool(result.Content, offset + offset3 - 4, 3);
boolean[] statusErr = siemensS7Net.getByteTransform().TransBool(result.Content, offset + offset3 - 8, 3);
boolean[] statusSign = siemensS7Net.getByteTransform().TransBool(resultErr.Content, offsetSign, 3);
+ if(siteId == 2032){
+ }
boolean loading = false;
if(!status1[0])
{
diff --git a/src/main/resources/mapper/BasArmMastMapper.xml b/src/main/resources/mapper/BasArmMastMapper.xml
index 9e19700..abe2b5c 100644
--- a/src/main/resources/mapper/BasArmMastMapper.xml
+++ b/src/main/resources/mapper/BasArmMastMapper.xml
@@ -62,8 +62,6 @@
and d.matnr = #{matnr}
</select>
-
-
<select id="selectBasArmMastSignValue" resultType="java.lang.Double">
select top 1
d.anfme
@@ -74,4 +72,24 @@
and d.create_time = #{bindingTags}
</select>
+ <select id="selectCountAndBindingTags" resultType="java.lang.Integer">
+ select count(1)
+ from asr_bas_arm_mast d
+ where 1=1
+ and d.arm_no = #{armNo}
+ and d.order_no = #{orderNo}
+ and d.matnr = #{matnr}
+ and d.binding_tags = #{bindingTags}
+ </select>
+
+ <select id="selectCountAndBindingTagsLog" resultType="java.lang.Integer">
+ select count(1)
+ from asr_bas_arm_mast_log d
+ where 1=1
+ and d.arm_no = #{armNo}
+ and d.order_no = #{orderNo}
+ and d.matnr = #{matnr}
+ and d.binding_tags = #{bindingTags}
+ </select>
+
</mapper>
--
Gitblit v1.9.1