From 7c36a39a0a2abf561d6c529f4918323f2c44945c Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 26 二月 2025 08:58:26 +0800
Subject: [PATCH] agv站点修改
---
src/main/java/com/zy/common/web/WcsController.java | 475 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 428 insertions(+), 47 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index d822f05..2eab1e8 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -1,14 +1,19 @@
package com.zy.common.web;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
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;
+import com.zy.common.config.WebSocketServer;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
@@ -18,9 +23,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -49,6 +52,355 @@
private RowLastnoService rowLastnoService;
@Autowired
private WorkService workService;
+ @Autowired
+ 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 getledError(@RequestBody Map<String, String> param) {
+ String sta = param.get("sta");
+ String message = param.get("msg");
+ if (Cools.isEmpty(sta) ) {
+ return R.error();
+ }
+ 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);
+
+
+ return R.ok();
+
+ }
+
+
+ @Transactional
+ 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)){
+ throw new CoolException("鏈壘鍒颁换鍔�");
+ }
+ StartupDto dto = new StartupDto();
+ // 鑾峰彇鐩爣绔�
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", wrkMast.getIoType() - 50)
+ .eq("stn_no", 31002) // 浣滀笟绔欑偣 = 鎷ｆ枡鍑哄簱鐨勭洰鏍囩珯
+ .eq("crn_no", wrkMast.getCrnNo()); // 鍫嗗灈鏈哄彿
+ StaDesc staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)){
+ throw new CoolException("鏈壘鍒扮珯鐐硅矾寰�");
+ }
+ 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.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {
+ throw new CoolException("淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐�");
+ }
+
+ Date now = new Date();
+ // 鍫嗗灈鏈虹珯鐐�(鐩爣绔�)
+ Integer staNo = staDesc.getCrnStn();
+ // 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬�
+ wrkMast.setIoTime(now);
+ wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
+ wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
+ wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 婧愮珯
+ wrkMast.setStaNo(staNo); // 鐩爣绔�
+ wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 鐩爣搴撲綅 = 鍑哄簱鏃剁殑婧愬簱浣�
+ wrkMast.setSourceLocNo(""); // 婧愬簱浣嶆竻绌�
+ wrkMast.setModiTime(now);
+ if (!wrkMastService.updateById(wrkMast)) {
+ throw new CoolException("鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
+ }
+ // 鏇存柊鏄庣粏妗o_time (鍘嗗彶妗ｅ叧鑱斾娇鐢級
+ wrkDetlService.updateIoTime(wrkMast.getWrkNo(), now);
+ // 淇敼搴撲綅鐘舵�� Q.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴�
+ LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
+ locMast.setLocSts("Q");
+ locMast.setModiTime(new Date());
+ if (!locMastService.updateById(locMast)) {
+ throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
+ }
+ dto.setWorkNo(wrkMast.getWrkNo());
+ dto.setLocNo(wrkMast.getLocNo());
+ return dto;
+ } catch (Exception e) {
+ throw new CoolException("鍑洪敊");
+ }
+ }else {
+
+ }
+ return dto;
+ }
+
+ @PostMapping("/pakin2/loc/v1")
+ @ResponseBody
+ @Transactional
+ public synchronized R getLocNo2(@RequestBody SearchLocParam param) {
+ if (Cools.isEmpty(param.getIoType())) {
+ return R.error("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�");
+ }
+ if (Cools.isEmpty(param.getSourceStaNo())) {
+ return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getBarcode())) {
+ return R.error("鏉＄爜涓嶈兘涓虹┖");
+ }
+ // 婧愮珯鐐圭姸鎬佹娴�
+ BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), false);
+ sourceStaNo.setLocType1(param.getLocType1());
+ LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
+
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+ .eq("barcode", param.getBarcode())
+ .eq("io_type", 107)
+ .eq("wrk_sts",14));
+ StartupDto dto = new StartupDto();
+
+ 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());
+ }
+ // 鑾峰彇鐩爣绔�
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", 57)
+ .eq("stn_no", sourceStaNo.getDevNo())
+ .eq("crn_no", wrkMast1.getCrnNo());
+ StaDesc staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)) {
+ 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());
+ }
+ 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涓嬪彂淇℃伅");
+ return R.ok().add(dto);
+ }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())){
+ return R.error("鏄庣粏宸茬粡琚慨鏀�,鏁呴殰");
+ }
+ }
+
+ Date now = new Date();
+ if (param.getIoType() == 107) {//鐩樼偣鍐嶅叆搴�
+ try{
+ // 妫�绱㈠簱浣�
+ 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,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())){
+ throw new Exception("鐩爣搴撲綅locMast鏌ヨ涓虹┖||locMast.getLocSts涓虹┖");
+ }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)) {
+ log.error(" /pakin2/loc/v1 --- 淇敼搴撲綅鐘舵�佸け璐ワ紒" + locMast.getLocNo());
+ throw new Exception("淇敼搴撲綅鐘舵�佸け璐�");
+ }
+ }
+ }
+ if (!locDetlService.updateLocNo(locMast.getLocNo(),wrkMast.getSourceLocNo())){
+ log.error(" /pakin2/loc/v1 --- 搴撳瓨鏄庣粏杞Щ澶辫触锛�" + wrkMast.getWrkNo());
+ throw new Exception("搴撳瓨鏄庣粏杞Щ澶辫触");
+ }
+ // 淇敼婧愬簱浣嶇姸鎬� O 绌哄簱浣�
+ LocMast locMast2 = locMastService.selectById(wrkMast.getSourceLocNo());
+ locMast2.setLocSts("O");
+ locMast2.setBarcode("");
+ locMast2.setModiTime(now);
+ if (!locMastService.updateById(locMast2)) {
+ log.error(" /pakin2/loc/v1 --- 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紒" + wrkMast.getSourceLocNo());
+ throw new Exception("淇敼婧愬簱浣嶇姸鎬佸け璐�");
+ }
+
+ try{
+ // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+ if (wrkMastService.saveWrkMastLog(wrkMast.getWrkNo())==0) {
+ log.error(" stnToCrnStnPick2 --- 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐ワ紒" + wrkMast.getWrkNo());
+ }
+ // 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬�
+ wrkMast.setIoTime(now);
+ wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 107->57
+ wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
+ wrkMast.setSourceStaNo(param.getSourceStaNo()); // 婧愮珯
+ wrkMast.setStaNo(dto.getStaNo()); // 鐩爣绔�
+ wrkMast.setModiTime(now);
+ wrkMast.setLocNo(dto.getLocNo());
+ wrkMast.setCrnNo(dto.getCrnNo());
+ if (!wrkMastService.updateById(wrkMast)) {
+ log.error(" stnToCrnStnPick --- 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐ワ紒" + wrkMast.getWrkNo());
+ throw new CoolException("鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
+ }
+ // 鏇存柊鏄庣粏妗o_time (鍘嗗彶妗ｅ叧鑱斾娇鐢級
+ wrkDetlService.updateIoTimeWms(wrkMast.getWrkNo(),now);
+ }catch (Exception e){
+ throw new CoolException("鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸嚭閿�");
+ }
+ }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());
+ return R.ok().add(dto);
+ }
@PostMapping("/pakin/loc/v1")
@ResponseBody
@@ -60,48 +412,62 @@
if (Cools.isEmpty(param.getSourceStaNo())) {
return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
}
- List<WaitPakin> waitPakins = null;
- if (param.getIoType() == 1) {
- if (Cools.isEmpty(param.getBarcode())) {
- return R.error("鏉＄爜涓嶈兘涓虹┖");
- }
- waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
- if (Cools.isEmpty(waitPakins)) {
- WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
- if (wrkMast != null && wrkMast.getIoType() == 103) {
- return R.parse(CodeRes.PICK_600);
+ WrkMast wrkMastPakin = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+ .eq("barcode", param.getBarcode())
+ .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 {
+ List<WaitPakin> waitPakins = null;
+ if (param.getIoType() == 1) {
+ if (Cools.isEmpty(param.getBarcode())) {
+ return R.error("鏉＄爜涓嶈兘涓虹┖");
}
- return R.parse(CodeRes.NO_COMB_700);
+ waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
+ if (Cools.isEmpty(waitPakins)) {
+ WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
+ if (wrkMast != null && wrkMast.getIoType() == 103) {
+ return R.parse(CodeRes.PICK_600);
+ }
+ 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 ( countWrk > 0) {
+ return R.error(param.getBarcode()+"鏉＄爜鍦ㄥ伐浣滄。涓凡瀛樺湪");
+ }
}
- int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",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 (Cools.isEmpty(param.getLocType1())){
+ return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
}
- }
- if (Cools.isEmpty(param.getLocType1())){
- return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
+
+ // 婧愮珯鐐圭姸鎬佹娴�
+ BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
+ sourceStaNo.setLocType1(param.getLocType1());
+ LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
+
+ StartupDto dto = null;
+ switch (param.getIoType()) {
+ case 1://婊℃墭鐩樺叆搴�
+ assert waitPakins != null;
+ dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins);
+ break;
+ case 10://绌烘墭鐩樺叆搴�
+ dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
+ break;
+ default:
+ break;
+ }
+ log.info("WCS鍏ュ簱鎺ュ彛杩斿弬:{},鎵樼洏鐮�:{}", dto, param.getBarcode());
+ return R.ok().add(dto);
}
- // 婧愮珯鐐圭姸鎬佹娴�
- BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
- sourceStaNo.setLocType1(param.getLocType1());
- LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
- StartupDto dto = null;
- switch (param.getIoType()) {
- case 1://婊℃墭鐩樺叆搴�
- assert waitPakins != null;
- dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins);
- break;
- case 10://绌烘墭鐩樺叆搴�
- dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
- break;
- default:
- break;
- }
- log.info("WCS鍏ュ簱鎺ュ彛杩斿弬:{},鎵樼洏鐮�:{}", dto, param.getBarcode());
- return R.ok().add(dto);
}
@PostMapping("/auto/emptyIn/v1")
@@ -111,7 +477,7 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(12, true);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(rowLastnoService.selectNextWhsType(), 10, 15, null, locTypeDto,0);
+ StartupDto dto = commonService.getLocNo( 10, 12, null,null,null, locTypeDto,false);
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -146,7 +512,7 @@
return R.error("搴撳瓨娌℃湁绌烘澘");
}
EmptyPlateOutParam emptyPlateOutParam = new EmptyPlateOutParam();
- emptyPlateOutParam.setOutSite(11);
+ emptyPlateOutParam.setOutSite(12);
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("鐢熸垚鑷姩绌烘墭鍑哄簱澶辫触"));
@@ -160,8 +526,23 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
- List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
- StartupDto dto = commonService.getLocNo(1, 1, devpNo, matNos, locTypeDto,0);
+ List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
+ List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
+ boolean mixtrue =false;
+
+ if (matnrs.size() == 1 && batchs.size() == 1) {
+
+ }else if(matnrs.size() > 1 && batchs.size() == 1) {
+ mixtrue = true;
+ }else if(matnrs.size() == 1 && batchs.size() > 1) {
+ mixtrue = true;
+ }else if(matnrs.size() > 1 && batchs.size() > 1) {
+ mixtrue = true;
+ }
+ 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();
// 鐢熸垚宸ヤ綔妗�
@@ -170,7 +551,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());
@@ -236,7 +617,7 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, locTypeDto,0);
+ StartupDto dto = commonService.getLocNo( 10, devpNo, null,null,null, locTypeDto,false);
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -244,12 +625,12 @@
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());
wrkMast.setLocNo(dto.getLocNo());
- wrkMast.setFullPlt("N"); // 婊℃澘
+ wrkMast.setFullPlt(dto.getSourceStaNo() == 1025?"Y":"N"); // 婊℃澘
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("Y"); // 绌烘澘
--
Gitblit v1.9.1