From 73bf266cf0611862a76885c7cd81f7a3303e4cfa Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期五, 11 十月 2024 20:42:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/model/MatDto.java | 28 ++++++++++++++
src/main/resources/mapper/WrkDetlMapper.xml | 12 ++++++
src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java | 4 ++
src/main/java/com/zy/core/thread/LedThread.java | 8 ++++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 11 ++++-
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 12 ++++++
src/main/resources/application.yml | 2
src/main/java/com/zy/asrs/service/WrkDetlService.java | 4 ++
8 files changed, 78 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
index f953518..f4a6afb 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
@@ -19,4 +19,8 @@
List<WrkDetl> selectByWrkNo(Integer wrkNo);
+ Integer count1();
+ Integer count2(@Param("orderNo")String orderNo);
+ Integer count3();
+
}
diff --git a/src/main/java/com/zy/asrs/service/WrkDetlService.java b/src/main/java/com/zy/asrs/service/WrkDetlService.java
index 81d4e92..8660ed7 100644
--- a/src/main/java/com/zy/asrs/service/WrkDetlService.java
+++ b/src/main/java/com/zy/asrs/service/WrkDetlService.java
@@ -17,4 +17,8 @@
List<WrkDetl> selectByWrkNo(Integer wrkNo);
+ Integer count1();
+ Integer count2(String orderNo);
+ Integer count3();
+
}
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 f1fabb8..1a940ee 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2365,7 +2365,8 @@
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, led.getDevpPlcId());
// 鍛戒护闆嗗悎
List<LedCommand> commands = new ArrayList<>();
- // 宸ヤ綔妗ｉ泦鍚�
+ String orderNo = null;
+ // 宸ヤ綔妗ｉ泦鍚�
List<WrkMast> wrkMasts = new ArrayList<>();
for (Integer staNo : led.getStaArr()) {
// 鑾峰彇鍙夎溅绔欑偣
@@ -2425,7 +2426,13 @@
// ledCommand.setSourceStaNo(wrkMast.getSourceStaNo());
if (wrkMast.getIoType() != 110 && wrkMast.getIoType() != 10) {
List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo());
- wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(wrkDetl)));
+ if (Cools.isEmpty(wrkDetls)){
+ continue;
+ }
+ Integer count1 = wrkDetlService.count1();
+ Integer count2 = wrkDetlService.count2(wrkDetls.get(0).getOrderNo());
+ Integer count3 = wrkDetlService.count3();
+ wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(wrkDetl,count1,count2,count3)));
}
commands.add(ledCommand);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
index ed33bd9..f4d9696 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -63,4 +63,16 @@
return this.baseMapper.selectByWrkNo(wrkNo);
}
+ @Override
+ public Integer count1() {
+ return this.baseMapper.count1();
+ }
+ @Override
+ public Integer count2(String orderNo) {
+ return this.baseMapper.count2(orderNo);
+ }
+ @Override
+ public Integer count3() {
+ return this.baseMapper.count3();
+ }
}
diff --git a/src/main/java/com/zy/common/model/MatDto.java b/src/main/java/com/zy/common/model/MatDto.java
index b78e622..bcd35af 100644
--- a/src/main/java/com/zy/common/model/MatDto.java
+++ b/src/main/java/com/zy/common/model/MatDto.java
@@ -30,6 +30,12 @@
// private String juanNo;
private String price;
private String orderNo;
+ private String cstmrName;
+ private String memo;
+ private Integer count1;
+ private Integer count2;
+ private Integer count3;
+ private Integer count4;
// 鐗╂枡鏁伴噺
private Double count;
@@ -68,4 +74,26 @@
this.volume = wrkDetl.getVolume();
this.orderNo = wrkDetl.getOrderNo();
}
+
+ public MatDto(WrkDetl wrkDetl,Integer count1,Integer count2,Integer count3) {
+ this.matNo = wrkDetl.getMatnr();
+ this.matnr = wrkDetl.getMatnr();
+ this.maknx = wrkDetl.getMaktx();
+ this.specs = wrkDetl.getSpecs();
+ this.batch = wrkDetl.getBatch();
+ this.model = wrkDetl.getModel();
+ if (Cools.isEmpty(wrkDetl.getPrice())){
+ wrkDetl.setPrice(0.0);
+ }
+ this.price = wrkDetl.getPrice().toString();
+// this.juanNo = wrkDetl.getSku();
+ this.count = wrkDetl.getAnfme();
+ this.weight = wrkDetl.getWeight();
+ this.volume = wrkDetl.getVolume();
+ this.orderNo = wrkDetl.getOrderNo();
+ this.cstmrName = wrkDetl.getColor();
+ this.count1 = count1;
+ this.count2 = count2;
+ this.count3 = count3;
+ }
}
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index 0cbc00a..b8b340b 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -213,6 +213,14 @@
for (MatDto matDto : command.getMatDtos()) {
sb.append("鐗╂枡缂栫爜锛�").append(matDto.getMatNo()).append("\n");
sb.append("鏁伴噺锛�").append(matDto.getCount()).append("\n");
+ sb.append("绠卞彿锛�").append(matDto.getBatch()).append("\n");
+ sb.append("鍗峰彿锛�").append(matDto.getSpecs()).append("\n");
+ sb.append("璁㈠崟鍙凤細").append(matDto.getOrderNo()).append("\n");
+ sb.append("瀹㈡埛锛�").append(matDto.getCstmrName()).append("\n");
+ sb.append("澶囨敞锛�").append(matDto.getMemo()).append("\n");
+ sb.append("鎬讳綔涓氫腑鏁伴噺锛�").append(matDto.getCount1()).append("\n");
+ sb.append("鐮佸灈鍚庢湭鍙栬揣鏁伴噺锛�").append(matDto.getCount3()).append("\n");
+ sb.append("璁㈠崟浣滀笟涓暟閲忥細").append(matDto.getCount2()).append("\n");
}
}
sb.append("\n");
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 93fa67c..204b37d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -45,7 +45,7 @@
enable: false
wms:
- url: 192.168.18.9:8080/jtwms
+ url: 192.168.18.4:8080/jtwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index 20376be..90cf3af 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -41,4 +41,16 @@
select * from asr_wrk_detl where 1=1 and wrk_no = #{wrkNo}
</select>
+ <select id="count1" resultType="Integer">
+ select count(1) from asr_wrk_detl where 1=1 and (wrk_no in (select wrk_no from asr_wrk_mast where 1=1 and wrk_sts in (11,12,13,14)))
+ </select>
+
+ <select id="count2" resultType="Integer">
+ select count(1) from asr_wrk_detl where 1=1 and order_no = #{orderNo} and (wrk_no in (select wrk_no from asr_wrk_mast where 1=1 and wrk_sts in (11,12,13,14)))
+ </select>
+
+ <select id="count3" resultType="Integer">
+ select count(1) from asr_bas_devp where 1=1 and dev_no > 19999
+ </select>
+
</mapper>
--
Gitblit v1.9.1