From 01e44ad191f1a9756640d0baec00987009281ecf Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 20 八月 2024 13:44:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 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 33730fb..c3f4301 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -44,6 +44,9 @@
// 浜屾ゼ鍫嗗灈鏈哄搴斿叆搴撶珯鐐�
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};
+
@Autowired
private OrderService orderService;
@@ -1081,6 +1084,7 @@
for (Mat obj : list) {
WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(obj);
wrkDetl.setWrkNo(wrkMast.getWrkNo());
wrkDetl.setAnfme(1.0);
// 閲嶆柊瀹氫綅鏈ㄧ浣嶇疆
@@ -1095,7 +1099,6 @@
break;
}
}
- wrkDetl.sync(obj);
wrkDetl.setIoTime(now);
wrkDetl.setAppeTime(now);
wrkDetl.setModiTime(now);
@@ -1148,7 +1151,7 @@
wrkMast.setIoPri(14D); // 浼樺厛绾�
wrkMast.setCrnNo(crnNo);
wrkMast.setSourceStaNo(secondFloorIn[crnNo]);
- wrkMast.setStaNo(3013);
+ wrkMast.setStaNo(secondFloorOut[crnNo]);
wrkMast.setLocNo("");
wrkMast.setBarcode(param.getBarcode()); // 鎵樼洏鐮�
wrkMast.setFullPlt("N"); // 婊℃澘锛歒
@@ -1165,9 +1168,35 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
// 杩斿洖GWCS鐩爣淇℃伅
- pushStaNoToGwcs(wrkMast.getSourceStaNo(),wrkMast.getStaNo(),workNo,param.getBarcode());
+ pushStaNoToGwcs(param.getPalletizingNo(),wrkMast.getSourceStaNo(),workNo,param.getBarcode());
return R.ok("绌烘墭鍥炴祦璇锋眰鎴愬姛");
+ }
+
+ @Override
+ public R tb(TbParam param) {
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("barcode", param.getBarcode()));
+ if (wrkDetls.isEmpty()) {
+ return R.parse("鏃犵墿鏂欐槑缁嗕俊鎭�");
+ }
+ List<String> collect = wrkDetls.stream().map(WrkDetl::getUnit).distinct().collect(Collectors.toList());
+ return R.ok(collect);
+ }
+
+ @Override
+ public R dd(TbParam param) {
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("barcode", param.getBarcode()));
+ if (wrkDetls.isEmpty()) {
+ return R.parse("鏃犵墿鏂欐槑缁嗕俊鎭�");
+ }
+ List<DdParam> collect = wrkDetls.stream().map(wrkDetl -> {
+ DdParam ddParam = new DdParam();
+ ddParam.setBoxPos(wrkDetl.getOrigin());
+ ddParam.setBoxType(wrkDetl.getColor());
+ return ddParam;
+ }).distinct().collect(Collectors.toList());
+
+ return R.ok(collect);
}
@Override
@@ -1547,13 +1576,13 @@
// 鏌ヨ瑕佹媶鐨勪綅缃紝鍙湁涓�涓�
List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
- List<String> collect = wrkDetls.stream().map(WrkDetl::getOrigin).distinct().collect(Collectors.toList());
- String position = collect.get(0);
+ WrkDetl wrkDetl = wrkDetls.get(0);
// 杩斿洖鎷嗗灈瑙勫垯
ZphjcdgzVo zphjcdgzVo = new ZphjcdgzVo();
- zphjcdgzVo.setWorkNo(wrkMast.getWrkNo());
- zphjcdgzVo.setPosition(position);
+ zphjcdgzVo.setWorkNo(wrkDetl.getWrkNo());
+ zphjcdgzVo.setBoxType(wrkDetl.getColor());
+ zphjcdgzVo.setPosition(wrkDetl.getOrigin());
return R.ok(zphjcdgzVo);
}
--
Gitblit v1.9.1