From 7509e168c020fd6617f803a1a7b6771cf0d9de4a Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期二, 21 五月 2024 10:06:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java | 20 +++++++--
src/main/java/com/zy/asrs/task/BareBoardScheduler.java | 21 +++++++++-
src/main/java/com/zy/asrs/controller/OpenController.java | 13 ++++++
src/main/java/com/zy/asrs/entity/param/SmallContainersParam.java | 43 +++++++++++++++++++++
4 files changed, 89 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 6897f42..d420070 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -219,6 +219,19 @@
}
/**
+ * 璐存爣鏈鸿创鏍囧畬鎴�
+ */
+ @PostMapping("/small/containers/auth/v1")
+ @AppAuth(memo = "璐存爣鏈鸿创鏍囧畬鎴�") //old闇�瑕佷慨鏀�
+ public synchronized R smallContainers(@RequestHeader(required = false) String appkey,
+ @RequestBody LabellerCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ openService.labellerComplete(param);
+ return R.ok();
+ }
+
+ /**
* 涓帶(2妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
*/
@PostMapping("/palletizing/complete/auth/v1")
diff --git a/src/main/java/com/zy/asrs/entity/param/SmallContainersParam.java b/src/main/java/com/zy/asrs/entity/param/SmallContainersParam.java
new file mode 100644
index 0000000..1bd249f
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/SmallContainersParam.java
@@ -0,0 +1,43 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Created by vincent on 2020/6/28
+ */
+@Data
+public class SmallContainersParam {
+
+ // 鍗曟嵁缂栧彿
+ private String orderNo;
+
+ // 鎵樼洏鏉＄爜
+ private String barcode;
+
+ private List<CombMat> combMats;
+
+ @Data
+ public static class CombMat {
+
+ // 鐗╂枡缂栧彿
+ private String matnr;
+
+ // 搴忓垪鐮�
+ private String batch;
+
+ // 鐗╂枡鏁伴噺
+ private Double anfme;
+
+ // 鍟嗗搧鍚嶇О
+ private String maktx;
+
+ // 瑙勬牸
+ private String specs;
+
+ private Double weight;
+
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
index 65c7de9..19d4ac1 100644
--- a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
+++ b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
@@ -86,13 +86,28 @@
// }
@Scheduled(cron = "0/3 * * * * ? ")
- private void execute(){//鑷姩璋冪┖鏉垮嚭搴� 鐓滄槦浜屾ゼ灏忔枡绠� 172
+ private void execute1(){//鑷姩璋冪┖鏉垮嚭搴� 鐓滄槦浜屾ゼ灏忔枡绠� 172
if (slaveWmsParameterProperties.isAutomaticFillingBoardStaNosBoolean()){
Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard172"));
if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 160).le("dev_no", 172).eq("loading", "Y"));
- if (loadIngCount<=10){
- bareBoardHandler.startYx(172);
+ int count = 10;
+ if (loadIngCount<=count){
+ bareBoardHandler.startYx(172,count);
+ }
+ }
+ }
+ }
+
+ @Scheduled(cron = "0/3 * * * * ? ")
+ private void execute2(){//鑷姩璋冪┖鏉垮嚭搴� 鐓滄槦涓�妤�
+ if (slaveWmsParameterProperties.isAutomaticFillingBoardStaNosBoolean()){
+ Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard445"));
+ if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
+ int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 421).le("dev_no", 465).eq("loading", "Y"));
+ int count = 10;
+ if (loadIngCount<=count){
+ bareBoardHandler.start(445,count);
}
}
}
diff --git a/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java b/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
index 1b64e5e..f2d4d60 100644
--- a/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
@@ -46,9 +46,13 @@
@Autowired
private WorkService workService;
- public ReturnT<String> start(Integer staNo) {
+ public ReturnT<String> start(Integer staNo,Integer count) {
try {
- if (!Cools.isEmpty(wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", staNo)))){
+// if (!Cools.isEmpty(wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", staNo)))){
+// return null;
+// }
+ int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", staNo));
+ if (wrkCount>count){
return null;
}
// 鑾峰彇宸ヤ綔鍙�
@@ -64,6 +68,7 @@
crns.add(4);
crns.add(5);
crns.add(6);
+ crns.add(7);
boolean sign = true;
for (Integer crnNo : crns){
BasCrnp basCrnp = basCrnpService.selectById(crnNo);
@@ -145,18 +150,23 @@
return SUCCESS;
}
- public ReturnT<String> startYx(Integer staNo) {
+ public ReturnT<String> startYx(Integer staNo,Integer count) {
try {
// if (!Cools.isEmpty(wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", staNo)))){
// return null;
// }
int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", staNo));
- if (wrkCount>10){
+ if (wrkCount>count){
return null;
}
ArrayList<Integer> crns =new ArrayList<>();
crns.add(1);
crns.add(2);
+ crns.add(3);
+ crns.add(4);
+ crns.add(5);
+ crns.add(6);
+ crns.add(7);
boolean sign = true;
for (Integer crnNo : crns){
List<String> locNoList = new ArrayList<>();
@@ -191,7 +201,7 @@
}
if (sign) {
EmptyPlateOutParam param = new EmptyPlateOutParam();
- param.setOutSite(172);
+ param.setOutSite(staNo);
param.setLocNos(locNoList);
try{
workService.emptyPlateOut(param, 9999L);
--
Gitblit v1.9.1