From 1c0dbad152362ac704a27ecfc5b5d08247385d87 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 21 十月 2025 17:12:48 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/common/web/WcsController.java | 297 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 201 insertions(+), 96 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 0fb2cc6..834dc61 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -47,7 +47,7 @@
@Autowired
private WaitPakinService waitPakinService;
@Autowired
- private LocDetlService locDetlService;
+ private LocDetlService locDetlService;
@Autowired
private RowLastnoService rowLastnoService;
@Autowired
@@ -73,7 +73,9 @@
List<WrkMast> wrkMasts = new ArrayList<>();
// 鑾峰彇宸ヤ綔妗ｆ暟鎹�
WrkMast wrkMast = wrkMastService.selectById(taskNo);
- if (null == wrkMast) { return R.error(); }
+ if (null == wrkMast) {
+ return R.error();
+ }
wrkMasts.add(wrkMast);
// 缁勮鍛戒护
LedCommand ledCommand = new LedCommand();
@@ -122,27 +124,27 @@
} else {
total = locDetl.getAnfme();
}
- if (!Cools.isEmpty(wrkDetl.getOrderNo())){
- OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", wrkDetl.getOrderNo())
+ if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
+ OrderDetlPakout orderDetlPakout = orderDetlService.selectOne(new EntityWrapper<OrderDetlPakout>().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()));
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total, orderDetlPakout.getSuppCode(), orderDetlPakout.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()));
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total, orderDetlPakout.getSuppCode(), orderDetlPakout.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()));
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total, orderDetlPakout.getSuppCode(), orderDetlPakout.getSku()));
}
- }else {
+ } 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));
+ 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));
+ 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));
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total));
}
}
});
@@ -154,20 +156,114 @@
for (WrkMast wrkMast1 : wrkMasts) {
wrkMast1.setOveMk("Y");
wrkMast1.setModiTime(new Date());
- if (!wrkMastService.update(wrkMast1,new EntityWrapper<WrkMast>().eq("wrk_No",wrkMast1.getWrkNo()))) {
+ 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);
+ 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/getTask2")
+ @ResponseBody
+ public synchronized R getledTask2(@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())) {
+ OrderDetlPakout orderDetlPakout = orderDetlService.selectOne(new EntityWrapper<OrderDetlPakout>().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, orderDetlPakout.getSuppCode(), orderDetlPakout.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, orderDetlPakout.getSuppCode(), orderDetlPakout.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, orderDetlPakout.getSuppCode(), orderDetlPakout.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);
+ }
+ return R.ok(commands);
}
@PostMapping("/led/getError")
@@ -175,14 +271,14 @@
public synchronized R getledError(@RequestBody Map<String, String> param) {
String sta = param.get("sta");
String message = param.get("msg");
- if (Cools.isEmpty(sta) ) {
+ if (Cools.isEmpty(sta)) {
return R.error();
}
- Map<String,Object> map=new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<String, Object>();
- map.put("to",sta);
- map.put("message",Cools.add("type", "error").add("errMsg",message));
- webSocketServer.onMessage(JSONObject.toJSONString(map),null,sta);
+ map.put("to", sta);
+ map.put("message", Cools.add("type", "error").add("errMsg", message));
+ webSocketServer.onMessage(JSONObject.toJSONString(map), null, sta);
return R.ok();
@@ -191,23 +287,23 @@
@Transactional
- public synchronized StartupDto getLocNo3(@RequestBody SearchLocParam param){
+ public synchronized StartupDto getLocNo3(@RequestBody SearchLocParam param) {
log.info("鏀跺埌WCS鎷ｆ枡鍏ュ簱鎺ュ彛璇锋眰====>>鍏ュ弬:{}", param);
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
- if (Cools.isEmpty(wrkMast)){
+ if (Cools.isEmpty(wrkMast)) {
throw new CoolException("鏈壘鍒颁换鍔�");
}
StartupDto dto = new StartupDto();
// 鑾峰彇鐩爣绔�
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", wrkMast.getIoType() - 50)
- .eq("stn_no", 31002) // 浣滀笟绔欑偣 = 鎷ｆ枡鍑哄簱鐨勭洰鏍囩珯
+ .eq("stn_no", param.getSourceStaNo()) // 浣滀笟绔欑偣 = 鎷ｆ枡鍑哄簱鐨勭洰鏍囩珯
.eq("crn_no", wrkMast.getCrnNo()); // 鍫嗗灈鏈哄彿
StaDesc staDesc = staDescService.selectOne(wrapper);
- if (Cools.isEmpty(staDesc)){
+ if (Cools.isEmpty(staDesc)) {
throw new CoolException("鏈壘鍒扮珯鐐硅矾寰�");
}
- if (wrkMast.getWrkSts() == 14 && (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107)){
+ if (wrkMast.getWrkSts() == 14 && (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107 || wrkMast.getIoType() == 104)) {
try {
// 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
// if (wrkMastService.saveWrkDetlLog(wrkMast.getWrkNo()) == 0) {
@@ -225,7 +321,7 @@
wrkMast.setIoTime(now);
wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
- wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 婧愮珯
+ wrkMast.setSourceStaNo(param.getSourceStaNo()); // 婧愮珯
wrkMast.setStaNo(staNo); // 鐩爣绔�
wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 鐩爣搴撲綅 = 鍑哄簱鏃剁殑婧愬簱浣�
wrkMast.setSourceLocNo(""); // 婧愬簱浣嶆竻绌�
@@ -248,7 +344,7 @@
} catch (Exception e) {
throw new CoolException("鍑洪敊");
}
- }else {
+ } else {
}
return dto;
@@ -275,18 +371,18 @@
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
.eq("barcode", param.getBarcode())
.eq("io_type", 107)
- .eq("wrk_sts",14));
+ .eq("wrk_sts", 14));
StartupDto dto = new StartupDto();
- if (Cools.isEmpty(wrkMast)){
- try{
- log.info("/pakin2/loc/v1:"+dto + "======鎵樼洏鐮�:"+param.getBarcode()+"姝ょ瑪宸ヤ綔妗ｆ湭鏌ヨ鍒扮洏鐐瑰嚭搴撲换鍔★紝寮�濮嬫煡璇㈢洏鐐瑰湪鍏ュ簱浠诲姟==銆�");
+ if (Cools.isEmpty(wrkMast)) {
+ try {
+ log.info("/pakin2/loc/v1:" + dto + "======鎵樼洏鐮�:" + param.getBarcode() + "姝ょ瑪宸ヤ綔妗ｆ湭鏌ヨ鍒扮洏鐐瑰嚭搴撲换鍔★紝寮�濮嬫煡璇㈢洏鐐瑰湪鍏ュ簱浠诲姟==銆�");
WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
.eq("barcode", param.getBarcode())
.eq("io_type", 57)
- .eq("wrk_sts",2));
- if (Cools.isEmpty(wrkMast1)){
- return R.error("鏈煡璇㈠埌宸ヤ綔妗�===銆嬫墭鐩樼爜:"+param.getBarcode());
+ .eq("wrk_sts", 2));
+ if (Cools.isEmpty(wrkMast1)) {
+ return R.error("鏈煡璇㈠埌宸ヤ綔妗�===銆嬫墭鐩樼爜:" + param.getBarcode());
}
// 鑾峰彇鐩爣绔�
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
@@ -298,54 +394,54 @@
log.error("type_no={},stn_no={},crn_no={}", 57, sourceStaNo, wrkMast1.getCrnNo());
throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
}
- if (!staDesc.getCrnStn().equals(wrkMast1.getStaNo())){
- throw new CoolException("鍫嗗灈鏈轰綔涓氱珯鐐逛笌宸ヤ綔鍙风洰鏍囩珯鐐逛笉涓�鑷达紒锛侊紒璇疯仈绯诲伐绋嬪笀淇敼"+
- "\\n鍫嗗灈鏈哄彿锛�"+wrkMast1.getCrnNo()+
- "\\n鍫嗗灈鏈虹珯鐐癸細"+staDesc.getCrnStn()+
- "\\n宸ヤ綔鍙凤細"+wrkMast1.getWrkNo()+
- "\\n宸ヤ綔妗ｇ洰鏍囩珯鐐癸細"+wrkMast1.getStaNo());
+ if (!staDesc.getCrnStn().equals(wrkMast1.getStaNo())) {
+ throw new CoolException("鍫嗗灈鏈轰綔涓氱珯鐐逛笌宸ヤ綔鍙风洰鏍囩珯鐐逛笉涓�鑷达紒锛侊紒璇疯仈绯诲伐绋嬪笀淇敼" +
+ "\\n鍫嗗灈鏈哄彿锛�" + wrkMast1.getCrnNo() +
+ "\\n鍫嗗灈鏈虹珯鐐癸細" + staDesc.getCrnStn() +
+ "\\n宸ヤ綔鍙凤細" + wrkMast1.getWrkNo() +
+ "\\n宸ヤ綔妗ｇ洰鏍囩珯鐐癸細" + wrkMast1.getStaNo());
}
dto.setWorkNo(wrkMast1.getWrkNo());
dto.setCrnNo(wrkMast1.getCrnNo());
dto.setLocNo(wrkMast1.getLocNo());
dto.setStaNo(wrkMast1.getStaNo());
dto.setSourceStaNo(wrkMast1.getSourceStaNo());
- log.info("/pakin2/loc/v1:"+dto + "======鎵樼洏鐮�:"+param.getBarcode()+"姝ょ瑪宸ヤ綔妗ｅ凡缁忔槸鐩樼偣鍐嶅叆搴撶姸鎬侊紝杩斿洖wcs涓嬪彂淇℃伅");
+ log.info("/pakin2/loc/v1:" + dto + "======鎵樼洏鐮�:" + param.getBarcode() + "姝ょ瑪宸ヤ綔妗ｅ凡缁忔槸鐩樼偣鍐嶅叆搴撶姸鎬侊紝杩斿洖wcs涓嬪彂淇℃伅");
return R.ok().add(dto);
- }catch (Exception e){
- log.error("/pakin2/loc/v1:======鎵樼洏鐮�:"+param.getBarcode()+"鐩樼偣鍥炲簱鏌ヨ宸ヤ綔妗ｅ嚭閿�======>"+e);
+ } catch (Exception e) {
+ log.error("/pakin2/loc/v1:======鎵樼洏鐮�:" + param.getBarcode() + "鐩樼偣鍥炲簱鏌ヨ宸ヤ綔妗ｅ嚭閿�======>" + e);
return R.error("鏌ョ湅wms==>info==>error");
}
}
List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
- if (Cools.isEmpty(locDetls) || locDetls.size()<1){
- return R.error("鎵樼洏鐮�:"+param.getBarcode()+",鏈煡鍒板簱瀛樻槑缁�");
- }else {
- if (!locDetls.get(0).getLocNo().equals(wrkMast.getSourceLocNo())){
+ if (Cools.isEmpty(locDetls) || locDetls.size() < 1) {
+ return R.error("鎵樼洏鐮�:" + param.getBarcode() + ",鏈煡鍒板簱瀛樻槑缁�");
+ } else {
+ if (!locDetls.get(0).getLocNo().equals(wrkMast.getSourceLocNo())) {
return R.error("鏄庣粏宸茬粡琚慨鏀�,鏁呴殰");
}
}
Date now = new Date();
if (param.getIoType() == 107) {//鐩樼偣鍐嶅叆搴�
- try{
+ try {
// 妫�绱㈠簱浣�
List<KeyValueVo> list = locDetls.stream().map(item -> new KeyValueVo(item.getMatnr(), item.getBatch())).distinct().collect(Collectors.toList());
- try{
+ 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,locDetls.size()>1);
- }catch (Exception e){
- log.error("鍫嗗灈鏈虹珯鐩樼偣鍐嶅叆搴撴煡璇㈠簱浣嶅嚭閿�:"+e.getMessage()+e);
+ 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()");
// throw new Exception("鏌ヨ搴撲綅鍑洪敊锛屽弬鏁帮細param.getSourceStaNo():"+param.getSourceStaNo()+"==>list:"+list+"==>locTypeDto:"+locTypeDto);
}
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", dto.getLocNo()));
- if (Cools.isEmpty(locMast) || Cools.isEmpty(locMast.getLocSts())){
+ if (Cools.isEmpty(locMast) || Cools.isEmpty(locMast.getLocSts())) {
throw new Exception("鐩爣搴撲綅locMast鏌ヨ涓虹┖||locMast.getLocSts涓虹┖");
- }else {
- if (!locMast.getLocSts().equals("O")){
- throw new Exception("鐩爣搴撲綅锛乴ocMast.getLocSts.equals(鈥淥鈥�)"+locMast.getLocSts());
- }else {
+ } else {
+ if (!locMast.getLocSts().equals("O")) {
+ throw new Exception("鐩爣搴撲綅锛乴ocMast.getLocSts.equals(鈥淥鈥�)" + locMast.getLocSts());
+ } else {
locMast.setLocSts("Q");
locMast.setBarcode(param.getBarcode());
if (!locMastService.updateById(locMast)) {
@@ -354,7 +450,7 @@
}
}
}
- if (!locDetlService.updateLocNo(locMast.getLocNo(),wrkMast.getSourceLocNo())){
+ if (!locDetlService.updateLocNo(locMast.getLocNo(), wrkMast.getSourceLocNo())) {
log.error(" /pakin2/loc/v1 --- 搴撳瓨鏄庣粏杞Щ澶辫触锛�" + wrkMast.getWrkNo());
throw new Exception("搴撳瓨鏄庣粏杞Щ澶辫触");
}
@@ -368,9 +464,9 @@
throw new Exception("淇敼婧愬簱浣嶇姸鎬佸け璐�");
}
- try{
+ try {
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
- if (wrkMastService.saveWrkMastLog(wrkMast.getWrkNo())==0) {
+ if (wrkMastService.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {
log.error(" stnToCrnStnPick2 --- 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐ワ紒" + wrkMast.getWrkNo());
}
// 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬�
@@ -387,18 +483,18 @@
throw new CoolException("鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
}
// 鏇存柊鏄庣粏妗o_time (鍘嗗彶妗ｅ叧鑱斾娇鐢級
- wrkDetlService.updateIoTimeWms(wrkMast.getWrkNo(),now);
- }catch (Exception e){
+ wrkDetlService.updateIoTimeWms(wrkMast.getWrkNo(), now);
+ } catch (Exception e) {
throw new CoolException("鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸嚭閿�");
}
- }catch (Exception e){
- log.error("/pakin2/loc/v1:======鎵樼洏鐮�:"+param.getBarcode()+"鐩樼偣鍥炲簱鍑洪敊======>"+e);
+ } catch (Exception e) {
+ log.error("/pakin2/loc/v1:======鎵樼洏鐮�:" + param.getBarcode() + "鐩樼偣鍥炲簱鍑洪敊======>" + e);
return R.error("鏌ョ湅wmsError");
}
} else {
return R.error();
}
- log.info("/pakin2/loc/v1:"+dto + "======鎵樼洏鐮�:"+param.getBarcode());
+ log.info("/pakin2/loc/v1:" + dto + "======鎵樼洏鐮�:" + param.getBarcode());
return R.ok().add(dto);
}
@@ -414,12 +510,12 @@
}
WrkMast wrkMastPakin = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
.eq("barcode", param.getBarcode())
- .in("io_type", 103,53,107,57)
- .eq("wrk_sts",14));
- if (!Cools.isEmpty(wrkMastPakin)){
+ .in("io_type", 103, 53, 107, 57, 104, 54)
+ .eq("wrk_sts", 14));
+ if (!Cools.isEmpty(wrkMastPakin)) {
StartupDto locNo3 = getLocNo3(param);
return R.ok(locNo3);
- }else {
+ } else {
List<WaitPakin> waitPakins = null;
if (param.getIoType() == 1) {
if (Cools.isEmpty(param.getBarcode())) {
@@ -433,16 +529,16 @@
}
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 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 ( countWrk > 0) {
- return R.error(param.getBarcode()+"鏉＄爜鍦ㄥ伐浣滄。涓凡瀛樺湪");
+ int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
+ if (countWrk > 0) {
+ return R.error(param.getBarcode() + "鏉＄爜鍦ㄥ伐浣滄。涓凡瀛樺湪");
}
}
- if (Cools.isEmpty(param.getLocType1())){
+ if (Cools.isEmpty(param.getLocType1())) {
return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
}
@@ -472,12 +568,12 @@
@PostMapping("/auto/emptyIn/v1")
@ResponseBody
- public R autoEmptyIn(@RequestBody LocTypeDto locTypeDto){
+ public R autoEmptyIn(@RequestBody LocTypeDto locTypeDto) {
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(12, true);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo( 10, 12, null,null,null, locTypeDto,false);
+ StartupDto dto = commonService.getLocNo(10, 12, null, null, null, locTypeDto, false);
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -500,12 +596,12 @@
wrkMast.setAppeTime(now);
wrkMast.setModiTime(now);
wrkMast.setMemo("鑷姩绌烘墭鍏ュ簱");
- return wrkMastService.insert(wrkMast) ? R.ok("鑷姩绌烘墭鍏ュ簱鎴愬姛,宸ヤ綔鍙�:"+wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍏ュ簱澶辫触");
+ return wrkMastService.insert(wrkMast) ? R.ok("鑷姩绌烘墭鍏ュ簱鎴愬姛,宸ヤ綔鍙�:" + wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍏ュ簱澶辫触");
}
@PostMapping("auto/emptyOut/v1")
@ResponseBody
- public R autoEmptyOut(){
+ public R autoEmptyOut() {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_sts", "D"));
if (Cools.isEmpty(locMast)) {
@@ -513,9 +609,11 @@
}
EmptyPlateOutParam emptyPlateOutParam = new EmptyPlateOutParam();
emptyPlateOutParam.setOutSite(12);
- emptyPlateOutParam.setLocNos(new ArrayList<String>(){{add(locMast.getLocNo()+"");}});
+ emptyPlateOutParam.setLocNos(new ArrayList<String>() {{
+ add(locMast.getLocNo() + "");
+ }});
WrkMast wrkMast = workService.emptyPlateOut(emptyPlateOutParam);
- return R.ok(!Cools.isEmpty(wrkMast)? R.ok("鑷姩绌烘墭鍑哄簱鎴愬姛,宸ヤ綔鍙�:" + wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍑哄簱澶辫触"));
+ return R.ok(!Cools.isEmpty(wrkMast) ? R.ok("鑷姩绌烘墭鍑哄簱鎴愬姛,宸ヤ綔鍙�:" + wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍑哄簱澶辫触"));
}
/**
@@ -527,8 +625,14 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
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, matnrs.size() > 1);
+ List<String> batchs = waitPakins.stream().map(WaitPakin::getSku).distinct().collect(Collectors.toList());
+ 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();
// 鐢熸垚宸ヤ綔妗�
@@ -581,19 +685,19 @@
// 鏇存柊婧愮珯鐐逛俊鎭�
sourceStaNo.setWrkNo(workNo);
sourceStaNo.setModiTime(now);
- if (!basDevpService.updateById(sourceStaNo)){
+ if (!basDevpService.updateById(sourceStaNo)) {
throw new CoolException("鏇存柊婧愮珯澶辫触");
}
// 鏇存柊鐩爣搴撲綅鐘舵��
LocMast locMast = locMastService.selectById(dto.getLocNo());
- if (locMast.getLocSts().equals("O")){
+ if (locMast.getLocSts().equals("O")) {
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
locMast.setModiTime(now);
- if (!locMastService.updateById(locMast)){
+ if (!locMastService.updateById(locMast)) {
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
} else {
- throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+ throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
return dto;
}
@@ -603,7 +707,7 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo( 10, devpNo, null,null,null, locTypeDto,false);
+ StartupDto dto = commonService.getLocNo(10, devpNo, null, null, null, locTypeDto, false);
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -616,7 +720,7 @@
wrkMast.setSourceStaNo(dto.getSourceStaNo());
wrkMast.setStaNo(dto.getStaNo());
wrkMast.setLocNo(dto.getLocNo());
- wrkMast.setFullPlt(dto.getSourceStaNo() == 1025?"Y":"N"); // 婊℃澘
+ wrkMast.setFullPlt(dto.getSourceStaNo() == 1025 ? "Y" : "N"); // 婊℃澘
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("Y"); // 绌烘澘
@@ -633,21 +737,22 @@
// 鏇存柊婧愮珯鐐逛俊鎭�
sourceStaNo.setWrkNo(workNo);
sourceStaNo.setModiTime(new Date());
- if (!basDevpService.updateById(sourceStaNo)){
+ if (!basDevpService.updateById(sourceStaNo)) {
throw new CoolException("鏇存柊婧愮珯澶辫触");
}
// 鏇存柊鐩爣搴撲綅鐘舵��
LocMast locMast = locMastService.selectById(dto.getLocNo());
- if (locMast.getLocSts().equals("O")){
+ if (locMast.getLocSts().equals("O")) {
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
locMast.setModiTime(new Date());
- if (!locMastService.updateById(locMast)){
+ if (!locMastService.updateById(locMast)) {
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
} else {
- throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+ throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
return dto;
}
+
}
--
Gitblit v1.9.1