From 10e6a9a8adad2226f13a4e4704ca5b2ad5b9ef9a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期日, 21 十二月 2025 18:49:59 +0800
Subject: [PATCH] 刀具库WMS功能完善
---
src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java | 263 ++++++++++++++++++++++++----------------------------
1 files changed, 121 insertions(+), 142 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java
index e6b7a13..1c92379 100644
--- a/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java
@@ -9,6 +9,7 @@
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.digitaltwin.DtLocDetailVo;
import com.zy.asrs.entity.mes.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.rcs.*;
@@ -133,11 +134,7 @@
// 瑙勫垯瀹氫箟锛氶粯璁ょ3灞備负鍚屾鐨勭墿鏂欑被鍨�
long secondPath = 2;
String secondParentName = WMS_CURRENT_NAME;
-// long locType = 1;
long userId = defaultUserId;
-// if (mesMatInfo.getModified_operator1() != null && !mesMatInfo.getModified_operator1().isEmpty()) {
-// userId = Long.parseLong(mesMatInfo.getModified_operator1());
-// }
Date now = new Date();
if (mesMatInfo.getModified_date1() != null && !mesMatInfo.getModified_date1().isEmpty()) {
now = Date.from(OffsetDateTime.parse(mesMatInfo.getModified_date1()).toInstant());
@@ -168,35 +165,29 @@
// 鐗╂枡鏇存柊
long tagId = tagService.selectByName(mesMatInfo.getItem_type(), 3).getId();
Mat mat = matService.selectByMatnr(mesMatInfo.getItem_no());
- Mat newMat = new Mat();
- newMat.setMatnr(mesMatInfo.getItem_no());
- newMat.setMaktx(mesMatInfo.getDescription());
- newMat.setTagId(tagId);
- newMat.setLocType(tagId); //locType
- newMat.setSpecs(mesMatInfo.getSpecification());
- newMat.setUnit("浠�"); //缁熶竴涓轰欢锛宮esMatInfo.getUnit_of_measure()
- newMat.setModel(mesMatInfo.getClassification_code());
- newMat.setMemo(JSONObject.toJSONString(mesMatInfo));
- newMat.setCreateBy(userId);
- newMat.setCreateTime(now);
- newMat.setUpdateBy(userId);
- newMat.setUpdateTime(now);
- newMat.setStatus(1);
if (mat == null) {
- if (!matService.insert(newMat))
- return -2;
+ Mat newMat = new Mat();
+ newMat.setMatnr(mesMatInfo.getItem_no());
+ newMat.setMaktx(mesMatInfo.getDescription());
+ newMat.setTagId(tagId);
+ newMat.setLocType(tagId); //locType
+ newMat.setSpecs(mesMatInfo.getSpecification());
+ newMat.setUnit(mesMatInfo.getUnit_of_measure());
+ newMat.setModel(mesMatInfo.getClassification_code());
+// newMat.setMemo(JSONObject.toJSONString(mesMatInfo));
+ newMat.setCreateBy(userId);
+ newMat.setCreateTime(now);
+ newMat.setUpdateBy(userId);
+ newMat.setUpdateTime(now);
+ newMat.setStatus(1);
+ matService.insert(newMat);
} else {
- JSONObject dbMemo = JSONObject.parseObject(mat.getMemo());
-// dbMemo.remove("OrderNo");
-// dbMemo.remove("qty");
- JSONObject newMemo = JSONObject.parseObject(newMat.getMemo());
-// newMemo.remove("OrderNo");
-// newMemo.remove("qty");
- if (!dbMemo.equals(newMemo)) {
- newMat.setId(mat.getId());
- if (!matService.updateById(newMat))
- return -2;
- }
+ mat.setMaktx(mesMatInfo.getDescription());
+ mat.setSpecs(mesMatInfo.getSpecification());
+ mat.setUnit(mesMatInfo.getUnit_of_measure());
+ mat.setModel(mesMatInfo.getClassification_code());
+ mat.setUpdateTime(now);
+ matService.updateById(mat);
}
return 1;
@@ -266,6 +257,9 @@
return 0;
}
+ @Resource
+ private BasStationService basStationService;
+
/**
* 鍑哄簱鐢宠
* 鍔犲伐搴撱�佸垁鍏峰簱
@@ -274,22 +268,38 @@
* @return 1 鎴愬姛锛�-1 璁㈠崟閲嶅锛�
*/
@Transactional
- public int outBoundOrder(MesInApply mesOutApply){
+ public MesReturn outBoundOrder(MesInApply mesOutApply) {
+ MesReturn mesReturn = new MesReturn();
+ // 缁堢偣涓虹┖锛岃绠楁帴椹充綅
+ BasStation basStation = null;
+ if (Cools.isEmpty(mesOutApply.getNextStationId())) {
+ List<BasStation> basStations = basStationService.selectList(new EntityWrapper<BasStation>().eq("loc_sts", "O"));
+ if (basStations.isEmpty()) {
+ mesReturn.setSuccess("2");
+ mesReturn.setMessage("鏃犵┖鎺ラ┏浣嶏紝璇风◢鍚庡啀璇�!");
+ return mesReturn;
+ }
+ // 鎺ラ┏鐐�
+ basStation = basStations.get(0);
+ mesOutApply.setNextStationId(basStation.getDevNo());
+ }
// docType鏍规嵁搴撶被鍨嬬‘瀹�
- long docType = 7;
+ long docType = Long.parseLong(mesOutApply.getBillType());
long settle = 1;
// 鏍￠獙璁㈠崟鏄惁閲嶅
OrderPakout order = orderPakoutService.selectByNo(mesOutApply.getOrderNo());
if (order != null && !StringUtils.isEmpty(order.getOrderNo())) {
- return -1;
+ mesReturn.setSuccess("2");
+ mesReturn.setMessage("orderNo閲嶅锛�" + mesOutApply.getOrderNo());
+ return mesReturn;
}
// 鐢熸垚璁㈠崟
Date now = new Date();
OrderPakout orderPakout = new OrderPakout();
- orderPakout.setUuid( String.valueOf(snowflakeIdWorker.nextId()));
+ orderPakout.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
orderPakout.setOrderNo(mesOutApply.getOrderNo());
orderPakout.setOrderTime(com.core.common.DateUtils.convert(now));
orderPakout.setDocType(docType);
@@ -302,7 +312,7 @@
orderPakout.setMemo(JSONObject.toJSONString(mesOutApply));
orderPakout.setPakinPakoutStatus(2);
if (!orderPakoutService.insert(orderPakout)) {
- log.error("MES淇濆瓨鍑哄簱璁㈠崟涓绘。澶辫触:{}",orderPakout);
+ log.error("MES淇濆瓨鍑哄簱璁㈠崟涓绘。澶辫触:{}", orderPakout);
throw new CoolException("淇濆瓨鍑哄簱璁㈠崟涓绘。澶辫触");
}
@@ -325,74 +335,43 @@
orderDetlPakout.setStatus(1);
orderDetlPakout.setPakinPakoutStatus(2);
if (!orderDetlPakoutService.insert(orderDetlPakout)) {
- log.error("MES淇濆瓨鍑哄簱璁㈠崟鏄庣粏妗ｅけ璐�:{}",orderDetlPakout);
+ log.error("MES淇濆瓨鍑哄簱璁㈠崟鏄庣粏妗ｅけ璐�:{}", orderDetlPakout);
throw new CoolException("淇濆瓨鍑哄簱璁㈠崟鏄庣粏妗ｅけ璐�");
}
}
- // TODO锛欳TU鍑哄簱鍔ㄤ綔
-
// 绔嬪簱鐢熸垚璁㈠崟鍚庯紝鑷姩璋冨害AGV浠庝骇绾胯繍杈撶┖鍒�鏋惰嚦绔嬪簱缂撳瓨鍖恒��
- if (!StringUtils.isEmpty(mesOutApply.getTaskNo()) && !StringUtils.isEmpty(mesOutApply.getStationId())) {
- TransTask transTask = new TransTask();
- transTask.setTaskno(mesOutApply.getTaskNo());
- transTask.setTaskname(mesOutApply.getTaskname());
- transTask.setOrderNo(mesOutApply.getOrderNo());
- transTask.setTransType("02"); //杩愬洖鍒�鏋舵椂榛樿02锛堜笅绌烘墭锛� mesOutApply.getTransType()
- transTask.setCurProcess(mesOutApply.getProductLineId());
- transTask.setCurStationId(mesOutApply.getStationId());
- transTask.setNextProcess(mesOutApply.getProductLineId());
- transTask.setNextStationId(mesOutApply.getNextStationId());
-// transTask.setItemno(mesOutApply.getItemNo());
- transTask.setQty(1);
- transTask.setProductLineId(mesOutApply.getProductLineId());
-// transTask.setItemBarcode(codes);
-// transTask.setTuoPanId(entry.getKey());
- transTask.setDjNo(mesOutApply.getDjNo());
- transTask.setOperateType(1);
- transTask.setAgvFactory(1);
- JSONObject sendAgvTask = submitTask(transTask);
- if (!"1".equals(sendAgvTask.getString("Success"))) {
- log.error("鍑哄簱涓嬪彂agv杩愯緭浠诲姟澶辫触锛歿}", JSONObject.toJSONString(transTask));
- }
+ TransTask transTask = new TransTask();
+ transTask.setTaskno(mesOutApply.getTaskNo());
+ transTask.setTaskname(mesOutApply.getTaskname());
+ transTask.setOrderNo(mesOutApply.getOrderNo());
+ transTask.setTransType("02"); //杩愬洖鍒�鏋舵椂榛樿02锛堜笅绌烘墭锛� mesOutApply.getTransType()
+ transTask.setCurProcess(mesOutApply.getProductLineId());
+ transTask.setCurStationId(mesOutApply.getStationId());
+ transTask.setNextProcess(mesOutApply.getProductLineId());
+ transTask.setNextStationId(mesOutApply.getNextStationId());
+ transTask.setQty(1);
+ transTask.setProductLineId(mesOutApply.getProductLineId());
+ transTask.setDjNo(mesOutApply.getDjNo());
+ transTask.setOperateType(1);
+ transTask.setAgvFactory(1);
+ JSONObject sendAgvTask = submitTask(transTask);
+ if ("1".equals(sendAgvTask.getString("Success"))) {
+ // 鏂版帴椹崇偣鐘舵��
+ if (basStation != null) {
+ basStation.setModiTime(new Date());
+ basStation.setLocSts("S");
+ basStation.setBarcode(mesOutApply.getDjNo());
+ basStationService.updateById(basStation);
}
- return 1;
- }
- public int transDj(String taskNo,String djNo) {
- try {
- EntityWrapper<Task> wapper = new EntityWrapper<>();
- wapper.eq("task_no", taskNo).orderBy("wrk_date");
- Task task = taskService.selectOne(wapper);
- if (task != null) {
- JSONObject memo = JSONObject.parseObject(task.getMemo());
-
- TransTask transTask = new TransTask();
- transTask.setTaskno(taskNo + "_1");
-// transTask.setTaskname(mesOutApply.getTaskname());
- transTask.setOrderNo(memo.getString("OrderNo"));
- transTask.setTransType("05"); //閫佸垁鏃堕粯璁�05锛堜笂鍒�锛�
- transTask.setCurStationId(WMS_TRANS_START_STATION_1);
- transTask.setNextProcess(memo.getString("ProductLineId"));
- transTask.setNextStationId(memo.getString("CurStationId"));
-// transTask.setItemno(mesOutApply.getItemNo());
-// transTask.setQty(0);
- transTask.setProductLineId(memo.getString("ProductLineId"));
-// transTask.setItemBarcode(codes);
-// transTask.setTuoPanId(entry.getKey());
- transTask.setOperateType(1);
- transTask.setAgvFactory(1);
- transTask.setDjNo(djNo);
- JSONObject sendAgvTask = submitTask(transTask);
- if (!"1".equals(sendAgvTask.getString("Success"))) {
- log.error("涓婂垁涓嬪彂agv杩愯緭浠诲姟澶辫触", JSONObject.toJSONString(transTask));
- }
- }
- } catch (Exception e) {
- log.error("涓婂垁涓嬪彂AGV杩愯緭浠诲姟澶辫触", e);
+ mesReturn.setSuccess("1");
+ mesReturn.setMessage("璁㈠崟涓嬪彂鎴愬姛锛宎gv寮�濮嬭繍杈擄細" + transTask.getTaskno());
+ return mesReturn;
+ } else {
+ log.error("鍑哄簱涓嬪彂agv杩愯緭浠诲姟澶辫触锛歿}", JSONObject.toJSONString(transTask));
+ throw new CoolException("鍑哄簱涓嬪彂agv杩愯緭浠诲姟澶辫触");
}
-
- return 1;
}
/**
@@ -710,7 +689,6 @@
/**
* 9.1涓嬪彂杩愯緭浠诲姟
- * TODO:鍏朵粬搴撶殑浠诲姟鍏ㄩ儴杞埌婊戝潡搴撶粺涓�璋冨害
*
* @param transTask
* @return
@@ -734,7 +712,11 @@
// 涓嬪彂缁橰CS
RcsTaskSubmit rcsTaskSubmit = new RcsTaskSubmit();
// 妯℃澘鍚�
- rcsTaskSubmit.setTaskType("CS");
+ if(transTask.getCurStationId().startsWith("LL") || transTask.getCurStationId().startsWith("LG")) { // 璧风偣浜х嚎
+ rcsTaskSubmit.setTaskType("DJ1");
+ } else if(transTask.getNextStationId().startsWith("LL") || transTask.getNextStationId().startsWith("LG")) { // 缁堢偣浜х嚎
+ rcsTaskSubmit.setTaskType("DJ2");
+ }
rcsTaskSubmit.setRobotTaskCode(transTask.getTaskno());
rcsTaskSubmit.setInitPriority(10); //榛樿10
List<RcsTaskTargetRoute> targetRouteList = new ArrayList<>();
@@ -990,51 +972,47 @@
return 0;
}
+ @Resource
+ private LocDetlService locDetlService;
+
+ @Resource
+ private LocMastService locMastService;
+
@Override
- public R tkt(String taskNo) {
- boolean flag = false;
- try {
- EntityWrapper<Task> wapper = new EntityWrapper<>();
- wapper.eq("task_no", taskNo).orderBy("wrk_date",false);
- Task task = taskService.selectOne(wapper);
- // 涓嬪彂缁橰CS
- RcsTaskSubmit rcsTaskSubmit = new RcsTaskSubmit();
- rcsTaskSubmit.setRobotTaskCode(taskNo + "-1");
- rcsTaskSubmit.setInitPriority(10); //榛樿10
- List<RcsTaskTargetRoute> targetRouteList = new ArrayList<>();
- RcsTaskTargetRoute startRoute = new RcsTaskTargetRoute();
- startRoute.setSeq(0);
- startRoute.setCode(task.getStaNo());
- startRoute.setOperation("COLLECT");
- targetRouteList.add(startRoute);
- RcsTaskTargetRoute endRoute = new RcsTaskTargetRoute();
- endRoute.setSeq(1);
- endRoute.setCode(task.getSourceStaNo());
- endRoute.setOperation("DELIVERY");
- targetRouteList.add(endRoute);
- rcsTaskSubmit.setTargetRoute(targetRouteList);
- // 鏇存柊璧风偣鍜岀粓鐐�
- String memo = task.getMemo();
- TransTask transTask = JSONObject.parseObject(memo, TransTask.class);
- transTask.setCurStationId(task.getSourceStaNo());
- transTask.setNextStationId(task.getStaNo());
- transTask.setTransType("01"); // 涓嬬┖鎵�
- // 鏇存柊agv浠诲姟璧风偣鍜岀粓鐐�
- task.setTaskNo(taskNo + "-1");
- task.setSourceStaNo(transTask.getCurStationId());
- task.setStaNo(transTask.getNextStationId());
- task.setMemo(JSONObject.toJSONString(transTask));
- taskService.updateById(task);
- // 杞彂缁欐捣搴锋垨鍗庢檽RCS
- RcsReturn rcsReturn = rcsService.submitTask(rcsTaskSubmit, transTask.getAgvFactory());
- if (rcsReturn.getCode().equals("SUCCESS")) {
- flag = true;
- }
- } catch (Exception e) {
- log.error("绌烘墭鍥炰骇绾垮彂AGV杩愯緭浠诲姟澶辫触", e);
+ public R queryStock(String matnr) {
+ List<LocDetl> locDetls;
+ if (Cools.isEmpty(matnr)) {
+ locDetls = locDetlService.selectList(new EntityWrapper<>());
+ } else {
+ locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("matnr",matnr));
}
- return flag ?R.ok() : R.parse("绌烘墭鍥炰骇绾垮懠鍙玜gv澶辫触");
+ List<String> locNoList = locDetls.stream().map(LocDetl::getLocNo).distinct().collect(Collectors.toList());
+ List<DtLocDetailVo> dtLocDetailVoList = new ArrayList<>();
+ for (String locNo: locNoList) {
+
+ LocMast locMast = locMastService.selectById(locNo);
+ DtLocDetailVo dtLocDetailVo = new DtLocDetailVo();
+ dtLocDetailVo.setLocNo(locNo);
+ dtLocDetailVo.setLocSts(locMast.getLocSts());
+ dtLocDetailVo.setRow1(locMast.getRow1());
+ dtLocDetailVo.setBay1(locMast.getBay1());
+ dtLocDetailVo.setLev1(locMast.getLev1());
+
+ List<LocDetl> locDetlList2 = locDetls.parallelStream().filter(o-> o.getLocNo().equals(locNo)).collect(Collectors.toList());
+ List<StockDetl> stockDetls = new ArrayList<>();
+ for(LocDetl locDetl:locDetlList2) {
+ StockDetl stockDetl = new StockDetl();
+ stockDetl.setMatnr(locDetl.getMatnr());
+ stockDetl.setMaktx(locDetl.getMaktx());
+ stockDetl.setAnfme(locDetl.getAnfme());
+ stockDetls.add(stockDetl);
+ }
+ dtLocDetailVo.setLocDetl(stockDetls);
+ dtLocDetailVoList.add(dtLocDetailVo);
+ }
+
+ return R.ok(dtLocDetailVoList);
}
// endregion
@@ -1047,8 +1025,9 @@
*/
private int checkRcsFactory(String agvNo) {
- AgvInfo agvInfo = agvInfoMapper.selectById(agvNo);
- return agvInfo.getAgvFactory();
+// AgvInfo agvInfo = agvInfoMapper.selectById(agvNo);
+// return agvInfo.getAgvFactory();
+ return 1;
}
}
--
Gitblit v1.9.1