From 8e0335c10755399ba4eda92512939995d844e7bd Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 18 七月 2024 08:59:37 +0800
Subject: [PATCH] 组托桁架相关接口开发
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 123 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 121 insertions(+), 2 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 8b629ee..1762a66 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -11,6 +11,8 @@
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
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.TagMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
@@ -28,6 +30,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
+import java.util.stream.Collectors;
/**
* Created by vincent on 2022/4/9
@@ -69,6 +72,8 @@
@Autowired
private WrkDetlSingleService wrkDetlSingleService;
@Autowired
+ private WrkMastLogService wrkMastLogService;
+ @Autowired
private WrkMastStaService wrkMastStaService;
@Autowired
private WrkMastStaLogService wrkMastStaLogService;
@@ -76,6 +81,8 @@
private StaDescService staDescService;
@Autowired
private LocMastService locMastService;
+ @Autowired
+ private ApiLogService apiLogService;
@Override
@Transactional
@@ -1295,8 +1302,120 @@
return "鍑哄簱鎴愬姛";
}
- @Autowired
- private ApiLogService apiLogService;
+ @Override
+ @Transactional
+ public R zphjDw(ZphjckdwParam param) {
+ // 鏍规嵁浠诲姟鍙峰緱鍒板伐浣滀富妗�
+ if (Cools.isEmpty(param.getWorkNo())) {
+ throw new CoolException("宸ヤ綔鍙蜂笉鑳戒负绌猴紒");
+ }
+ WrkMast wrkMast = wrkMastService.selectById(param.getWorkNo());
+ if (wrkMast == null) {
+ throw new CoolException("宸ヤ綔妗ｄ笉瀛樺湪锛�");
+ }
+ if (wrkMast.getWrkSts() != 2 || wrkMast.getIoType() != 103) {
+ throw new CoolException("宸ヤ綔妗ｅ綋鍓嶇姸鎬佷笉涓�2/鍑哄簱绫诲瀷涓嶄负鎷ｆ枡锛�");
+ }
+ // 鏇存柊宸ヤ綔妗ｇ姸鎬�2.璁惧涓婅蛋->42.绛夊緟鐮佸灈
+ wrkMast.setWrkSts(42L);
+ wrkMastService.updateById(wrkMast);
+
+ // 鏌ヨ瑕佹媶鐨勪綅缃紝鍙湁涓�涓�
+ 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);
+
+ // 杩斿洖鎷嗗灈瑙勫垯
+ ZphjcdgzVo zphjcdgzVo = new ZphjcdgzVo();
+ zphjcdgzVo.setWorkNo(wrkMast.getWrkNo());
+ zphjcdgzVo.setPosition(position);
+
+ return R.ok(zphjcdgzVo);
+ }
+
+ @Override
+ @Transactional
+ public R zphjCdwc(ZphjcdwcParam param) {
+
+ if (Cools.isEmpty(param.getWorkNo())) {
+ throw new CoolException("宸ヤ綔鍙蜂笉鑳戒负绌猴紒");
+ }
+ WrkMast wrkMast = wrkMastService.selectById(param.getWorkNo());
+ if (wrkMast == null) {
+ throw new CoolException("宸ヤ綔妗ｄ笉瀛樺湪锛�");
+ }
+ if (wrkMast.getWrkSts() != 42 || wrkMast.getIoType() != 103) {
+ throw new CoolException("宸ヤ綔妗ｅ綋鍓嶇姸鎬佷笉涓�42/鍑哄簱绫诲瀷涓嶄负鎷ｆ枡锛�");
+ }
+
+ // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+ if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
+ throw new CoolException("淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐�");
+ }
+
+ // 鏇存柊宸ヤ綔绫诲瀷103->53
+ wrkMast.setIoType(53);
+ wrkMast.setWrkSts(52L); // 宸ヤ綔鐘舵��42->52.璁惧涓婅蛋锛堟媶鍨涘畬鎴愶級
+ Integer staNo = wrkMast.getStaNo();
+ // 鐩爣绔欑偣婧愮珯鐐硅浆鎹�
+ wrkMast.setStaNo(wrkMast.getSourceStaNo());
+ wrkMast.setSourceStaNo(staNo);
+ // 鐩爣搴撲綅=婧愬簱浣�
+ wrkMast.setLocNo(wrkMast.getSourceLocNo());
+ // 婧愬簱浣嶆竻闄�
+ wrkMast.setSourceLocNo("");
+ wrkMast.setModiTime(new Date());
+
+ int outStaNo = 0; // 鍑哄簱婧愮珯鐐�
+ if (staNo == 3044 || staNo == 3045) {
+ outStaNo = 3046;
+ } else if(staNo == 3040 || staNo == 3041) {
+ outStaNo = 3042;
+ }
+ if (outStaNo == 0) {
+ throw new CoolException("鍑哄簱婧愮珯鐐硅浆鎹㈡湁璇細" + staNo);
+ }
+
+ // 鑾峰彇鍑哄簱鐗╂枡
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+ int descFlag = getType(wrkDetls);
+
+ // get0鍘熸墭鐩樺洖娴佷俊鎭紝get1鎷嗗灈鍑烘潵鐗╂枡鍑哄簱淇℃伅
+ List<ZphjcdwcVo> zphjcdwcVos = new ArrayList<>();
+ ZphjcdwcVo zphjcdwcVo1 = new ZphjcdwcVo();
+ zphjcdwcVo1.setWorkNo(wrkMast.getWrkNo());
+ zphjcdwcVo1.setStaNo(wrkMast.getStaNo());
+ zphjcdwcVo1.setSourceStaNo(wrkMast.getSourceStaNo());
+ zphjcdwcVos.add(zphjcdwcVo1);
+
+ ZphjcdwcVo zphjcdwcVo2 = new ZphjcdwcVo();
+ zphjcdwcVo2.setSourceStaNo(outStaNo);
+ zphjcdwcVo2.setStaNo(3106); // 3106/3077
+ zphjcdwcVo2.setDescFlag(descFlag);
+ zphjcdwcVos.add(zphjcdwcVo2);
+
+ // 鏇存柊宸ヤ綔涓绘。
+ wrkMastService.updateById(wrkMast);
+ // 淇敼搴撲綅鐘舵�� Q.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴�
+ LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
+ locMast.setLocSts("Q");
+ locMast.setModiTime(new Date());
+ if (!locMastService.updateById(locMast)) {
+ throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
+ }
+
+ // 涓嬪彂鍥炲簱鐨勭洰鏍囩珯鐐瑰拰鎷嗗灈鐨勫嚭搴撶洰鏍囩珯鐐圭粰gwcs
+ return R.ok(zphjcdwcVos);
+ }
+
+ /**
+ * 鏍规嵁鍑哄簱鐗╂枡鏄庣粏鍒ゆ柇鏄惁鍘昏创鏍�(鍗曞嵎璐存爣锛屽鍗蜂笉璐存爣)
+ * @param wrkDetls 鐗╂枡鏄庣粏
+ * @return 0.澶氬嵎涓嶈创鏍囪矾寰勶紝1.鍗曞嵎璐存爣璺緞
+ */
+ private int getType(List<WrkDetl> wrkDetls) {
+ return wrkDetls.size() > 1 ? 0 : 1; // 涓�鏉¤褰曞氨鏄竴鍗�
+ }
private void pushStaNoToGwcs(Integer palletizingNo, Integer staNo, Integer workNo) {
boolean success = false;
--
Gitblit v1.9.1