From 8201281992c1fe2968e6a9f7c87c5184c8c1c804 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期四, 11 十二月 2025 15:53:19 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/model/MatDto.java | 17 ++++++--
src/main/java/com/zy/asrs/controller/ConsoleController.java | 13 ++++++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 25 +++++++-----
src/main/java/com/zy/asrs/entity/WrkDetl.java | 40 ++++++++++++++++++++
src/main/java/com/zy/core/model/LedSlave.java | 1
src/main/java/com/zy/core/MainProcess.java | 2
src/main/resources/application.yml | 12 +++++-
7 files changed, 92 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index f2d16d8..23c4a6c 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -30,6 +30,7 @@
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
+import com.zy.core.model.LedSlave;
import com.zy.core.model.RgvSlave;
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.model.protocol.RgvProtocol;
@@ -41,6 +42,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.util.*;
/**
@@ -349,4 +351,15 @@
return R.ok().add(JSON.toJSONString(jsonObjects));
}
+ @GetMapping("/getLedInfos")
+ public R getLedInfos(HttpServletRequest request) {
+ String remoteAddr = request.getRemoteAddr();
+ for (LedSlave slave : slaveProperties.getLed()) {
+ if (slave.getIp().equals(remoteAddr)) {
+ return R.ok().add(slave);
+ }
+ }
+ return R.ok();
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index d44342c..b6168f4 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -267,12 +267,52 @@
@ApiModelProperty(value= "瀹㈡埛缂栧彿")
private Long uuid;
+
/**
* 澶囨敞
*/
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 澶囩敤1
+ */
+ @ApiModelProperty(value= "sku")
+ private String standby1;
+
+ /**
+ * 澶囩敤2
+ */
+ @ApiModelProperty(value= "upc")
+ private String standby2;
+
+ /**
+ * 澶囩敤3
+ */
+ @ApiModelProperty(value= "po")
+ private String standby3;
+
+ /**
+ * 澶囩敤1
+ */
+ @ApiModelProperty(value= "璐т富")
+ @TableField("box_type1")
+ private String boxType1;
+
+ /**
+ * 澶囩敤2
+ */
+ @ApiModelProperty(value= "璐т富缂栧彿")
+ @TableField("box_type2")
+ private String boxType2;
+
+ /**
+ * 澶囩敤3
+ */
+ @ApiModelProperty(value= "閲囪喘鍗曞彿")
+ @TableField("box_type3")
+ private String boxType3;
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
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 1f90cdf..b4b2b85 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2418,7 +2418,7 @@
} else {
total = locDetl.getAnfme();
}
- ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getOrderNo(), wrkDetl.getSupp(), wrkDetl.getSku(),wrkDetl.getAnfme(),total));
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getOrderNo(), wrkDetl.getBoxType3(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),wrkDetl.getAnfme(),total));
});
}
if (wrkMast.getIoType() != 110 && wrkMast.getIoType() != 10) {
@@ -2434,13 +2434,13 @@
total = locDetl.getAnfme();
}
if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 1) {
- ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getOrderNo(), wrkDetl.getSupp(), wrkDetl.getSku(),wrkDetl.getAnfme(),total));
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getOrderNo(), wrkDetl.getBoxType3(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),wrkDetl.getAnfme(),total));
}
if (wrkMast.getIoType() == 103 && (null == wrkDetl.getInspect() || 0 == wrkDetl.getInspect())) {
- ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getOrderNo(), wrkDetl.getSupp(), wrkDetl.getSku(),wrkDetl.getAnfme(),total));
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getOrderNo(), wrkDetl.getBoxType3(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),wrkDetl.getAnfme(),total));
}
if (wrkMast.getIoType() == 107) {
- ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getOrderNo(), wrkDetl.getSupp(), wrkDetl.getSku(),wrkDetl.getAnfme(),total));
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getOrderNo(), wrkDetl.getBoxType3(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),wrkDetl.getAnfme(),total));
}
});
}
@@ -3009,8 +3009,12 @@
}
public synchronized void autoEmptyIn() {
- SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
List<Integer> list = new ArrayList<>();
+ List<WrkMast> wrkMast = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("source_sta_no",1038));
+ if(wrkMast.size() >3){
+ return;
+ }
list.add(1038);
for (Integer site:list){
StaProtocol staProtocol = devpThread.getStation().get(site);
@@ -3729,13 +3733,11 @@
if (rgvProtocol.getTaskNo1()==0){
rgvPreSchedulingIn(rgv, rgvProtocol);//鑻ユ殏鏃犱笅鍙戜换鍔￠璋冨害鎻愬墠鍒板彇璐х偣
}
- rgvProtocol.setLastIo("O");
} else if (basRgv.getOutEnable().equals("1") && basRgv.getPakOut().equals("1")) {
//mark - 2 - ....
if (rgvProtocol.getTaskNo2()==0){
this.rgvPreSchedulingOut(rgv, rgvProtocol); // 鍑哄簱
}
- rgvProtocol.setLastIo("I");
}
}
// 濡傛灉鏈�杩戜竴娆℃槸鍑哄簱妯″紡
@@ -3744,12 +3746,10 @@
if (rgvProtocol.getTaskNo2()==0){
this.rgvPreSchedulingOut(rgv, rgvProtocol); // 鍑哄簱
}
- rgvProtocol.setLastIo("I");
} else if (basRgv.getInEnable().equals("1") && basRgv.getPakIn().equals("1")) {
if (rgvProtocol.getTaskNo1()==0){
rgvPreSchedulingIn(rgv, rgvProtocol);//鑻ユ殏鏃犱笅鍙戜换鍔￠璋冨害鎻愬墠鍒板彇璐х偣
}
- rgvProtocol.setLastIo("O");
}
}
}
@@ -5183,7 +5183,7 @@
.eq("sta_no", basArm.getStaNoSou())
.eq("status", 0)
);
- if (basArmMastList.isEmpty()){
+ if (basArmMastList.isEmpty()){
continue;
}
if (basArmMastList.size()>1){
@@ -5478,6 +5478,11 @@
basAgvMastService.insert(basAgvMast);
AgvBindCtnrAndBinParam agvBindCtnrAndBinParam = new AgvBindCtnrAndBinParam(basAgvMast);
agvBindCtnrAndBinParam.setCtnrCode(basAgvMast.getBarcode());
+ if(basAgvMast.getFloorNo() == 3){
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",dto.getLocNo()));
+ locMast.setBarcode(wrkMast.getBarcode());
+ locMastService.updateById(locMast);
+ }
agvBindCtnrAndBinParam.setCtnrTyp("1");
ReturnT<String> resultBind = new PostMesDataUtils().postMesDataAgv("AGV瀹瑰櫒缁戝畾", AgvConstant.AGV_URL, AgvConstant.AGV_CTNRANDBING, agvBindCtnrAndBinParam);
wrkMast.setTakeNone("2");
diff --git a/src/main/java/com/zy/common/model/MatDto.java b/src/main/java/com/zy/common/model/MatDto.java
index 5318db3..d2ed32f 100644
--- a/src/main/java/com/zy/common/model/MatDto.java
+++ b/src/main/java/com/zy/common/model/MatDto.java
@@ -20,12 +20,17 @@
//鍗曟嵁缂栧彿
private String orderNo;
+ //閲囪喘鍗曞彿
+ private String boxType3;
//瀹㈡埛PO
- private String supp;
+ private String standby1;
//鏉＄爜UPC
- private String sku;
+ private String standby2;
+
+ //瀹㈡埛sku
+ private String standby3;
// 瀹㈡埛淇℃伅
@@ -52,12 +57,14 @@
this.total = total;
}
- public MatDto(String matnr, String maknx, String orderNo, String supp, String sku,Double count, Double total) {
+ public MatDto(String matnr, String maknx, String orderNo, String boxType3, String standby1,String standby2,String standby3, Double count, Double total) {
this.matnr = matnr;
this.maknx = maknx;
this.orderNo = orderNo;
- this.supp = supp;
- this.sku = sku;
+ this.boxType3 = boxType3;
+ this.standby1 = standby1;
+ this.standby2 = standby2;
+ this.standby3 = standby3;
this.count = count;
this.total = total;
}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 5f7dfd0..30150c6 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -101,7 +101,7 @@
i=0;
}
- if(q>2){
+ if(q>5){
//绌烘墭鐩樿嚜鍔ㄥ叆搴�
mainService.autoEmptyIn();
q = 0;
diff --git a/src/main/java/com/zy/core/model/LedSlave.java b/src/main/java/com/zy/core/model/LedSlave.java
index af02dfc..184924c 100644
--- a/src/main/java/com/zy/core/model/LedSlave.java
+++ b/src/main/java/com/zy/core/model/LedSlave.java
@@ -20,5 +20,6 @@
// 鍙夎溅绔欑偣鏁扮粍
private List<Integer> staArr = new ArrayList<>();
+ private Integer crnId;
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e37ff6a..dbae323 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -510,7 +510,7 @@
inSta[0]:
staNo: 2037
barcode: ${wcs-slave.barcode[3].id}
- backSta: 2034
+ backSta: 2037
led: ${wcs-slave.led[5].id}
# # 绌烘澘鍏ュ簱鍙�1
# emptyInSta[0]:
@@ -616,6 +616,7 @@
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 1036
+ crnId: 5
# LED2
led[1]:
id: 2
@@ -623,6 +624,7 @@
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 1041
+ crnId: 4
# LED3
led[2]:
id: 3
@@ -630,6 +632,7 @@
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 1103
+ crnId: 2
# LED4
led[3]:
id: 4
@@ -637,6 +640,7 @@
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 1047
+ crnId: 1
# LED4
led[4]:
id: 5
@@ -644,6 +648,7 @@
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
staArr: 2037
+ crnId: 1
# LED5
led[5]:
id: 6
@@ -651,6 +656,7 @@
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
staArr: 4001
+ crnId: 3
# LED6
led[6]:
id: 7
@@ -658,10 +664,12 @@
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
staArr: 4006
+ crnId: 3
# LED7
led[7]:
id: 8
ip: 10.10.10.219
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 1041
\ No newline at end of file
+ staArr: 1041
+ crnId: 3
\ No newline at end of file
--
Gitblit v1.9.1