From 8d4540dcd0c3242474538cd8760723b9fe36c308 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 19 四月 2025 20:42:16 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/common/web/WcsController.java | 155 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 139 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 6107b1f..2f0d138 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -6,8 +6,10 @@
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
+import com.zy.asrs.command.LedCommand;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
+import com.zy.asrs.entity.param.MatDto;
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.*;
import com.zy.common.CodeRes;
@@ -19,7 +21,6 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.*;
import java.util.*;
@@ -55,13 +56,126 @@
private StaDescService staDescService;
@Autowired
private WebSocketServer webSocketServer;
+ @Autowired
+ private OrderDetlService orderDetlService;
+
+
+ @PostMapping("/led/getTask")
+ @ResponseBody
+ public synchronized R getledTask(@RequestBody Map<String, String> param) {
+ String taskNo = param.get("taskNo");
+ String sta = param.get("sta");
+ // 鍛戒护闆嗗悎
+ List<LedCommand> commands = new ArrayList<>();
+ if (!"0".equals(taskNo)) {
+
+ // 宸ヤ綔妗ｉ泦鍚�
+ List<WrkMast> wrkMasts = new ArrayList<>();
+ // 鑾峰彇宸ヤ綔妗ｆ暟鎹�
+ WrkMast wrkMast = wrkMastService.selectById(taskNo);
+ if (null == wrkMast) { return R.error(); }
+ wrkMasts.add(wrkMast);
+ // 缁勮鍛戒护
+ LedCommand ledCommand = new LedCommand();
+ ledCommand.setWorkNo(wrkMast.getWrkNo());
+ ledCommand.setIoType(wrkMast.getIoType());
+ wrkMasts.add(wrkMast);
+ // 鍑哄簱妯″紡
+ switch (wrkMast.getIoType()) {
+ case 1:
+ ledCommand.setTitle("鍏ㄦ澘鍏ュ簱");
+ break;
+ case 10:
+ ledCommand.setTitle("绌烘澘鍏ュ簱");
+ break;
+ case 101:
+ ledCommand.setTitle("鍏ㄦ澘鍑哄簱");
+ break;
+ case 103:
+ ledCommand.setTitle("鎷ｆ枡鍑哄簱");
+ break;
+ case 104:
+ ledCommand.setTitle("骞舵澘鍑哄簱");
+ break;
+ case 107:
+ ledCommand.setTitle("鐩樼偣鍑哄簱");
+ break;
+ case 110:
+ ledCommand.setTitle("绌烘澘鍑哄簱");
+ ledCommand.setEmptyMk(true);
+ break;
+ default:
+ break;
+ }
+ ledCommand.setSourceLocNo(wrkMast.getSourceLocNo());
+ ledCommand.setStaNo(wrkMast.getStaNo());
+ ledCommand.setBarcode(wrkMast.getBarcode());
+ if (wrkMast.getIoType() != 110 && wrkMast.getIoType() != 10) {
+ List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo());
+
+ wrkDetls.forEach(wrkDetl -> {
+ Double total = 0.0;
+ EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
+ LocDetl locDetl = locDetlService.selectOne(wrapper.eq("zpallet", wrkDetl.getZpallet()).eq("matnr", wrkDetl.getMatnr()));
+ if (Cools.isEmpty(locDetl)) {
+ total = wrkDetl.getAnfme();
+ } else {
+ total = locDetl.getAnfme();
+ }
+ if (!Cools.isEmpty(wrkDetl.getOrderNo())){
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", wrkDetl.getOrderNo())
+ .eq("matnr", wrkDetl.getMatnr()).eq("batch", wrkDetl.getBatch()));
+ if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 1) {
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total,orderDetl.getSuppCode(),orderDetl.getSku()));
+ }
+ if (wrkMast.getIoType() == 103 && (null == wrkDetl.getInspect() || 0 == wrkDetl.getInspect())) {
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total,orderDetl.getSuppCode(),orderDetl.getSku()));
+ }
+ if (wrkMast.getIoType() == 107 || wrkMast.getIoType() == 104) {
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total,orderDetl.getSuppCode(),orderDetl.getSku()));
+ }
+ }else {
+ if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 1) {
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
+ }
+ if (wrkMast.getIoType() == 103 && (null == wrkDetl.getInspect() || 0 == wrkDetl.getInspect())) {
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
+ }
+ if (wrkMast.getIoType() == 107 || wrkMast.getIoType() == 104) {
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
+ }
+ }
+ });
+ }
+ commands.add(ledCommand);
+
+ Set<Integer> workNos = wrkMasts.stream().map(WrkMast::getWrkNo).collect(Collectors.toSet());
+ // 淇敼涓绘。led鏍囪
+ for (WrkMast wrkMast1 : wrkMasts) {
+ wrkMast1.setOveMk("Y");
+ wrkMast1.setModiTime(new Date());
+ if (!wrkMastService.update(wrkMast1,new EntityWrapper<WrkMast>().eq("wrk_No",wrkMast1.getWrkNo()))) {
+ throw new CoolException("鏇存柊宸ヤ綔妗ｅけ璐�");
+ }
+ }
+ }
+
+
+
+ Map<String,Object> map=new HashMap<String, Object>();
+ map.put("to",sta);
+ map.put("message",Cools.add("type", "task").add("taskList",commands));
+ webSocketServer.onMessage(JSONObject.toJSONString(map),null,sta);
+ return R.ok();
+
+ }
@PostMapping("/led/getError")
@ResponseBody
- public synchronized R getLocNo(@RequestBody Map<String, String> param) {
+ public synchronized R getledError(@RequestBody Map<String, String> param) {
String sta = param.get("sta");
String message = param.get("msg");
- if (Cools.isEmpty(sta) || Cools.isEmpty(message)) {
+ if (Cools.isEmpty(sta) ) {
return R.error();
}
Map<String,Object> map=new HashMap<String, Object>();
@@ -93,12 +207,12 @@
if (Cools.isEmpty(staDesc)){
throw new CoolException("鏈壘鍒扮珯鐐硅矾寰�");
}
- if (wrkMast.getWrkSts() == 14 && wrkMast.getIoType() == 103){
+ if (wrkMast.getWrkSts() == 14 && (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107 || wrkMast.getIoType() == 104)){
try {
// 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
- if (wrkMastService.saveWrkDetlLog(wrkMast.getWrkNo()) == 0) {
- throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。澶辫触");
- }
+// if (wrkMastService.saveWrkDetlLog(wrkMast.getWrkNo()) == 0) {
+// throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。澶辫触");
+// }
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
if (wrkMastService.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {
throw new CoolException("淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐�");
@@ -219,7 +333,7 @@
List<KeyValueVo> list = locDetls.stream().map(item -> new KeyValueVo(item.getMatnr(), item.getBatch())).distinct().collect(Collectors.toList());
try{
// dto = commonService.getLocNo(1, 57, param.getSourceStaNo(), list, locTypeDto, 0);
- dto= commonService.getLocNo(1, param.getSourceStaNo(), locDetls.get(0).getMatnr(),locDetls.get(0).getBatch() ,null,locTypeDto);
+ dto= commonService.getLocNo(1, param.getSourceStaNo(), locDetls.get(0).getMatnr(),locDetls.get(0).getBatch() ,null,locTypeDto,locDetls.size()>1);
}catch (Exception e){
log.error("鍫嗗灈鏈虹珯鐩樼偣鍐嶅叆搴撴煡璇㈠簱浣嶅嚭閿�:"+e.getMessage()+e);
return R.error("e.getMessage()");
@@ -300,7 +414,7 @@
}
WrkMast wrkMastPakin = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
.eq("barcode", param.getBarcode())
- .in("io_type", 103,53)
+ .in("io_type", 103,53,107,57,104,54)
.eq("wrk_sts",14));
if (!Cools.isEmpty(wrkMastPakin)){
StartupDto locNo3 = getLocNo3(param);
@@ -320,9 +434,12 @@
return R.parse(CodeRes.NO_COMB_700);
}
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
+ if (countLoc > 0 ) {
+ return R.error(param.getBarcode()+"鏉＄爜鍦ㄥ簱瀛樹腑宸插瓨鍦�");
+ }
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
- if (countLoc > 0 || countWrk > 0) {
- return R.error(CodeRes.EXIST_500);
+ if ( countWrk > 0) {
+ return R.error(param.getBarcode()+"鏉＄爜鍦ㄥ伐浣滄。涓凡瀛樺湪");
}
}
if (Cools.isEmpty(param.getLocType1())){
@@ -360,7 +477,7 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(12, true);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo( 10, 12, null,null,null, locTypeDto);
+ StartupDto dto = commonService.getLocNo( 10, 12, null,null,null, locTypeDto,false);
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -411,7 +528,13 @@
// 妫�绱㈠簱浣�
List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
- StartupDto dto = commonService.getLocNo( 1, devpNo, matnrs.get(0),batchs.get(0),null, locTypeDto);
+ boolean mixtrue =false;
+
+
+ StartupDto dto = commonService.getLocNo( 1, devpNo, matnrs.get(0),batchs.get(0),null, locTypeDto, mixtrue);
+ if (Cools.isEmpty(dto)){
+ throw new CoolException("鏈壘鍒板簱浣嶄俊鎭�");
+ }
int workNo = dto.getWorkNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
@@ -420,7 +543,7 @@
wrkMast.setIoTime(new Date());
wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
- wrkMast.setIoPri(13D); // 浼樺厛绾�
+ wrkMast.setIoPri(12D); // 浼樺厛绾�
wrkMast.setCrnNo(dto.getCrnNo());
wrkMast.setSourceStaNo(dto.getSourceStaNo());
wrkMast.setStaNo(dto.getStaNo());
@@ -486,7 +609,7 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo( 10, devpNo, null,null,null, locTypeDto);
+ StartupDto dto = commonService.getLocNo( 10, devpNo, null,null,null, locTypeDto,false);
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -494,7 +617,7 @@
wrkMast.setIoTime(new Date());
wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
wrkMast.setIoType(10); // 鍏ュ嚭搴撶姸鎬侊細10.绌烘澘鍏ュ簱
- wrkMast.setIoPri(13D); // 浼樺厛绾�
+ wrkMast.setIoPri(12D); // 浼樺厛绾�
wrkMast.setCrnNo(dto.getCrnNo());
wrkMast.setSourceStaNo(dto.getSourceStaNo());
wrkMast.setStaNo(dto.getStaNo());
--
Gitblit v1.9.1