From 265881414a15ac8216abb860880bd6872872c42a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 12 九月 2024 12:49:34 +0800
Subject: [PATCH] mes接口对接
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 89 +++++++++++++++++++++++++++-----------------
1 files changed, 55 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index f43ab7b..67a7ab4 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -13,6 +13,7 @@
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.entity.result.ZphjcdgzVo;
import com.zy.asrs.entity.result.ZphjcdwcVo;
+import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.mapper.MatMapper;
import com.zy.asrs.mapper.TagMapper;
import com.zy.asrs.service.*;
@@ -45,6 +46,8 @@
private static final int[] secondFloorIn = new int[]{0,2061,2064,2067,2070,2073,2076};
// 鍫嗗灈鏈哄搴斾竴妤煎嚭搴撶珯鐐�
private static final int[] secondFloorOut = new int[]{0,3002,3003,3006,3008,3009,3012};
+ // 鍫嗗灈鏈哄搴斾竴妤煎叆搴撶珯鐐�
+ private static final int[] oneFloorIn = new int[]{0,3001,3004,3005,3007,3010,3011};
@Autowired
@@ -94,6 +97,9 @@
@Resource
private MatMapper matMapper;
+
+ @Resource
+ private LocDetlMapper locDetlMapper;
@Override
@Transactional
@@ -1343,7 +1349,7 @@
@Override
@Transactional
- public String zwmsOutLocWork(ZwmsOutLocWorkDto param) {
+ public R zwmsOutLocWork(ZwmsOutLocWorkDto param) {
Order order = orderService.selectByNo(param.getOrderNo());
if (!Cools.isEmpty(order)) {
@@ -1352,6 +1358,7 @@
DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
Date now = new Date();
+
// 鍗曟嵁涓绘。
order = new Order(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
@@ -1389,38 +1396,16 @@
now, // 淇敼鏃堕棿
null // 澶囨敞
);
+
if (!orderService.insert(order)) {
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
+
// 鍗曟嵁鏄庣粏妗�
- List<DetlDto> list = new ArrayList<>();
- List<ZwmsOutLocWorkDto.Rolls> orderDetails = param.getMatDetails();
- for (ZwmsOutLocWorkDto.Rolls detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getRollNo(), detail.getBoxNo(), 1.0);
- dto.setOrderNo(detail.getSpecs());
- dto.setSplices(detail.getSplices());
- if (DetlDto.has(list, dto)) {
- DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
- assert detlDto != null;
- detlDto.setAnfme(detlDto.getAnfme() + 1);
- } else {
- list.add(dto);
- }
- }
- for (DetlDto detlDto : list) {
-// Mat mat = matService.selectByMatnr(detlDto.getMatnr());
+ for (String groupNo : param.getGroups()) {
OrderDetl orderDetl = new OrderDetl();
-// if (Cools.isEmpty(mat)) {
-// throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
-// } else {
-// orderDetl.sync(mat);
-// }
- orderDetl.setSpecs(String.valueOf(detlDto.getSplices()));
- orderDetl.setBatch(detlDto.getBatch() == null ? "" : detlDto.getBatch());
- orderDetl.setModel(detlDto.getMatnr());
- orderDetl.setMatnr(detlDto.getOrderNo());
- orderDetl.setMaktx(detlDto.getOrderNo());
- orderDetl.setAnfme(detlDto.getAnfme());
+ orderDetl.setBrand(groupNo);
+ orderDetl.setBatch("");
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());
orderDetl.setCreateBy(9527L);
@@ -1429,12 +1414,25 @@
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
+ orderDetl.setAnfme(1.0);
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
}
- return null;
+ return R.ok("鍗曟嵁鐢熸垚鎴愬姛");
+
+ }
+
+ @Override
+ public R queryInLocTime(List<String> param) {
+ if (Cools.isEmpty(param)) {
+ return R.parse("鍙傛暟涓嶈兘涓虹┖");
+ }
+
+ List<InLocTimeDto> inLocTimeDtos = locDetlMapper.queryInLocTime(param);
+
+ return R.ok(inLocTimeDtos);
}
@Override
@@ -1462,11 +1460,11 @@
// 鍒拌揪鍑哄簱鍙ｇ‘璁や负1锛屾洿鏂板伐浣滄。鐘舵�佷负57.鍑哄簱瀹屾垚
if (param.getOutLocResult() == 1) {
- wrkMast.setWrkSts(20L);
- // 绌烘墭鐩樺埌浣嶇洿鎺ユ洿鏂板伐浣滄。鐘舵�佷负14.宸插嚭搴撴湭纭锛岀┖鎵樻棤闇�澶嶆牳纭
- if (!flag || wrkMast.getIoType() == 110) {
+// wrkMast.setWrkSts(20L);
+// // 绌烘墭鐩樺埌浣嶇洿鎺ユ洿鏂板伐浣滄。鐘舵�佷负14.宸插嚭搴撴湭纭锛岀┖鎵樻棤闇�澶嶆牳纭
+// if (!flag || wrkMast.getIoType() == 110) {
wrkMast.setWrkSts(14L);
- }
+// }
wrkMastService.updateById(wrkMast);
}
@@ -1646,7 +1644,7 @@
wrkMast.setIoType(53);
wrkMast.setWrkSts(52L); // 宸ヤ綔鐘舵��42->52.璁惧涓婅蛋锛堟媶鍨涘畬鎴愶級
// 鐩爣绔欑偣婧愮珯鐐硅浆鎹�
- wrkMast.setStaNo(wrkMast.getSourceStaNo());
+ wrkMast.setStaNo(oneFloorIn[wrkMast.getCrnNo()]);
wrkMast.setSourceStaNo(param.getSourceStaNo());
// 鐩爣搴撲綅=婧愬簱浣�
@@ -1669,6 +1667,29 @@
return R.ok(zphjcdwcVos);
}
+ @Override
+ public R requestXhd(String barcode) {
+
+ // 搴撳瓨鏄庣粏鏈ㄧ浣嶇疆闆嗗悎
+ List<LocDetl> locDetls = locDetlMapper.selectList(new EntityWrapper<LocDetl>().eq("zpallet", barcode));
+ List<String> collect1 = locDetls.stream().map(LocDetl::getOrigin).distinct().collect(Collectors.toList());
+ // 宸ヤ綔鏄庣粏鏈ㄧ浣嶇疆闆嗗悎
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("zpallet", barcode));
+ List<String> collect2 = wrkDetls.stream().map(WrkDetl::getOrigin).distinct().collect(Collectors.toList());
+
+ // 0鏄庣粏寮傚父,1浜乏锛�2浜彸锛�3閮戒寒
+ if (collect1.size() == 0 || collect2.size() == 0){
+ return R.ok(0);
+ } else if((collect1.size() == 1 && collect2.size() == 1) || (collect1.size() == 2 && collect2.size() == 2)) {
+ return R.ok(3);
+ } else if(collect1.size() == 2 && collect2.size() == 1) {
+ return R.ok(collect2.get(0).equals("宸�") ? 1 : 2);
+ } else {
+ return R.parse("浜俊鍙风伅鏉＄爜寮傚父锛�" + barcode);
+ }
+
+ }
+
/**
* 鍒涘缓妗佹灦鐞嗚揣鍑哄簱鐨勫伐浣滄。
*/
--
Gitblit v1.9.1