From 2da1bb97a1b536eb838c91ea327a6bfd41b0b876 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 30 十二月 2023 14:22:07 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/StockOutParam.java | 36 ++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java | 8 +
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WorkService.java | 12 ++
zy-asrs-common/src/main/java/com/zy/asrs/common/domain/enums/IoWorkType.java | 12 ++
zy-asrs-common/src/main/java/com/zy/asrs/common/domain/enums/WorkNoType.java | 48 ++++++++
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java | 128 ++++++++++++++++++++-
zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/LocDetlDto.java | 37 ++++++
zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/OutLocDto.java | 68 +++++++++++
8 files changed, 343 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/LocDetlDto.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/LocDetlDto.java
new file mode 100644
index 0000000..9a47fbf
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/LocDetlDto.java
@@ -0,0 +1,37 @@
+package com.zy.asrs.common.domain.dto;
+
+import com.zy.asrs.common.wms.entity.LocDetl;
+
+/**
+ * Created by vincent on 2020/6/17
+ */
+public class LocDetlDto {
+
+ private LocDetl locDetl;
+
+ private Double count;
+
+ public LocDetlDto() {
+ }
+
+ public LocDetlDto(LocDetl locDetl, Double count) {
+ this.locDetl = locDetl;
+ this.count = count;
+ }
+
+ public LocDetl getLocDetl() {
+ return locDetl;
+ }
+
+ public void setLocDetl(LocDetl locDetl) {
+ this.locDetl = locDetl;
+ }
+
+ public Double getCount() {
+ return count;
+ }
+
+ public void setCount(Double count) {
+ this.count = count;
+ }
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/OutLocDto.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/OutLocDto.java
new file mode 100644
index 0000000..45f415f
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/OutLocDto.java
@@ -0,0 +1,68 @@
+package com.zy.asrs.common.domain.dto;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.common.wms.entity.LocDetl;
+import com.zy.asrs.common.wms.service.LocDetlService;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.SpringUtils;
+import com.zy.asrs.framework.exception.CoolException;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * Created by vincent on 2020/6/17
+ */
+@Data
+public class OutLocDto {
+
+ private String locNo;
+
+ private Long hostId;
+
+ private List<LocDetlDto> locDetlDtos = new ArrayList<>();
+
+ public OutLocDto() {
+ }
+
+ public OutLocDto(String locNo, LocDetlDto locDetlDto, Long hostId) {
+ this.locNo = locNo;
+ this.locDetlDtos.add(locDetlDto);
+ this.hostId = hostId;
+ }
+
+ public boolean isAll(){
+ List<LocDetlDto> locDetlDtosCp = new ArrayList<>(this.locDetlDtos);
+ // 鏌ヨ褰撳墠搴撲綅鍙锋墍鏈夌殑搴撳瓨鏄庣粏
+ LocDetlService locDetlService = SpringUtils.getBean(LocDetlService.class);
+ List<LocDetl> locDetls = locDetlService.list(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocNo, this.locNo).eq(LocDetl::getHostId, this.hostId));
+ if (locDetls == null || locDetls.isEmpty()){
+ throw new CoolException("妫�绱㈠簱瀛樻槑缁嗗け璐ワ紝搴撲綅鍙�=" + this.locNo);
+ }
+ int sameNumber = 0;
+ for (LocDetl locDetl : locDetls) {
+ Iterator<LocDetlDto> iterator = locDetlDtosCp.iterator();
+ while (iterator.hasNext()) {
+ LocDetlDto next = iterator.next();
+ if (!next.getLocDetl().getMatnr().equals(locDetl.getMatnr())) {
+ continue;
+ }
+ if (!Cools.eq(next.getLocDetl().getBatch(), locDetl.getBatch())) {
+ continue;
+ }
+ if (next.getCount() > locDetl.getAnfme()) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ }
+ if (next.getCount().equals(locDetl.getAnfme())) {
+ sameNumber++;
+ iterator.remove();
+ break;
+ }
+ }
+ }
+ return sameNumber == locDetls.size();
+ }
+
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/enums/IoWorkType.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/enums/IoWorkType.java
new file mode 100644
index 0000000..d812c34
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/enums/IoWorkType.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.common.domain.enums;
+
+public enum IoWorkType {
+
+ ALL_IN,
+ PICK_IN,
+ ALL_OUT,
+ PICK_OUT,
+ CHECK_OUT,
+ ;
+
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/enums/WorkNoType.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/enums/WorkNoType.java
new file mode 100644
index 0000000..59cf9d5
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/enums/WorkNoType.java
@@ -0,0 +1,48 @@
+package com.zy.asrs.common.domain.enums;
+
+import com.zy.asrs.framework.exception.CoolException;
+
+/**
+ * 宸ヤ綔鍙锋帓搴忚鍒�
+ */
+public enum WorkNoType {
+
+ PAKIN(0),
+ PICK(1),
+ PAKOUT(2),
+ OTHER(3),
+ ;
+
+ public Integer type;
+
+ WorkNoType(Integer type) {
+ this.type = type;
+ }
+
+ public static Integer getWorkNoType(Integer ioType) {
+ switch (ioType) {
+ case 1:
+ return PAKIN.type;
+ case 10:
+ return PAKIN.type;
+ case 11:
+ return PICK.type;
+ case 53:
+ case 54:
+ case 57:
+ return PICK.type;
+ case 101:
+ return PAKOUT.type;
+ case 103:
+ case 104:
+ case 107:
+ return PICK.type;
+ case 110:
+ return PAKOUT.type;
+ default:
+ break;
+ }
+ throw new CoolException(ioType + "鐨勪换鍔＄被鍨嬫棤娉曠敓鎴愬伐浣滃彿");
+ }
+
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/StockOutParam.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/StockOutParam.java
new file mode 100644
index 0000000..c6b26bf
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/StockOutParam.java
@@ -0,0 +1,36 @@
+package com.zy.asrs.common.domain.param;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Created by vincent on 2020/6/13
+ */
+@Data
+public class StockOutParam {
+
+ // 鍑虹珯鍙�
+ private Integer outSite;
+
+ // 鐗╂枡缂栧彿闆嗗悎
+ private List<LocDetl> locDetls;
+
+ @Data
+ public static class LocDetl {
+
+ // 搴撲綅鍙�
+ private String locNo;
+
+ // 鍟嗗搧缂栧彿
+ private String matnr;
+
+ // 搴忓垪鐮�
+ private String batch;
+
+ // 鏁伴噺
+ private Double count;
+
+ }
+
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WorkService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WorkService.java
index 39b1c77..eec0311 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WorkService.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WorkService.java
@@ -1,6 +1,11 @@
package com.zy.asrs.common.wms.service;
+import com.zy.asrs.common.domain.dto.LocDetlDto;
+import com.zy.asrs.common.domain.enums.IoWorkType;
import com.zy.asrs.common.domain.param.FullStoreParam;
+import com.zy.asrs.common.domain.param.StockOutParam;
+
+import java.util.List;
public interface WorkService {
@@ -10,6 +15,11 @@
* @return 搴撲綅鍙�
*/
String startupFullPutStore(FullStoreParam param, Long userId, Long hostId);
+
+ /**
+ * 鍑哄簱浣滀笟
+ */
+ void startupFullTakeStore(StockOutParam param, Long userId, Long hostId);
/**
* 鎵嬪姩瀹屾垚宸ヤ綔妗�
@@ -26,5 +36,7 @@
*/
void pickWrkMast(String workNo, Long userId, Long hostId);
+ void stockOut(Integer staNo, List<LocDetlDto> locDetls, IoWorkType ioWorkType, Long userId, Long hostId);
+
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
index 3da20c3..4aed8a5 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
@@ -1,12 +1,14 @@
package com.zy.asrs.common.wms.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.common.domain.dto.DetlDto;
-import com.zy.asrs.common.domain.dto.LocTypeDto;
-import com.zy.asrs.common.domain.dto.StartupDto;
+import com.zy.asrs.common.domain.dto.*;
import com.zy.asrs.common.domain.entity.StaDesc;
+import com.zy.asrs.common.domain.enums.IoWorkType;
+import com.zy.asrs.common.domain.enums.WorkNoType;
import com.zy.asrs.common.domain.param.FullStoreParam;
+import com.zy.asrs.common.domain.param.StockOutParam;
import com.zy.asrs.common.sys.service.StaDescService;
+import com.zy.asrs.common.utils.Utils;
import com.zy.asrs.common.wms.entity.*;
import com.zy.asrs.common.wms.service.*;
import com.zy.asrs.framework.common.BaseRes;
@@ -17,9 +19,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
import java.util.concurrent.TimeUnit;
/**
@@ -49,6 +49,8 @@
private WrkDetlLogService wrkDetlLogService;
@Autowired
private StaDescService staDescService;
+ @Autowired
+ private LocDetlService locDetlService;
@Override
@Transactional
@@ -138,6 +140,120 @@
@Override
@Transactional
+ public void startupFullTakeStore(StockOutParam param, Long userId, Long hostId) {
+ // 鑾峰彇搴撲綅鏄庣粏
+ List<LocDetlDto> locDetlDtos = new ArrayList<>();
+ for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
+ if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
+ LocDetl one = locDetlService.selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch(), hostId);
+ if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount()));
+ }
+ }
+ if (!locDetlDtos.isEmpty()) {
+ // 鍚姩鍑哄簱寮�濮� 101.鍑哄簱
+ stockOut(param.getOutSite(), locDetlDtos, null, userId, hostId);
+ } else {
+ throw new CoolException("搴撳瓨涓嶅瓨鍦�");
+ }
+ }
+
+ @Override
+ public void stockOut(Integer staNo, List<LocDetlDto> locDetlDtos, IoWorkType ioWorkType, Long userId, Long hostId) {
+ Date now = new Date();
+ // 鍚堝苟鍚岀被椤�
+ Set<String> locNos = new HashSet<>();
+ List<OutLocDto> dtos = new ArrayList<>();
+ for (LocDetlDto locDetlDto : locDetlDtos) {
+ String locNo = locDetlDto.getLocDetl().getLocNo();
+ if (locNos.contains(locNo)) {
+ for (OutLocDto dto : dtos) {
+ if (dto.getLocNo().equals(locNo)) {
+ dto.getLocDetlDtos().add(locDetlDto);
+ break;
+ }
+ }
+ } else {
+ locNos.add(locNo);
+ dtos.add(new OutLocDto(locNo, locDetlDto, hostId));
+ }
+ }
+ Integer ioType = null;
+ // 鐢熸垚宸ヤ綔妗�
+ for (OutLocDto dto : dtos) {
+ // 鍒ゆ柇鍏ュ嚭搴撶被鍨嬶細101.鍏ㄦ澘鍑哄簱 or 103.鎷ｆ枡鍑哄簱
+ if (ioWorkType == null) {
+ ioType = dto.isAll() ? 101 : 103;
+ } else if (ioWorkType.equals(IoWorkType.CHECK_OUT)) {
+ ioType = 107;
+ }
+ assert ioType != null;
+ // 鑾峰彇搴撲綅
+ LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, dto.getLocNo()).eq(LocMast::getHostId, hostId));
+ // 鑾峰彇璺緞
+ StaDesc staDesc = staDescService.getOne(new LambdaQueryWrapper<StaDesc>().eq(StaDesc::getTypeNo, ioType).eq(StaDesc::getDeviceStn, staNo).eq(StaDesc::getHostId, hostId));
+ // 鐢熸垚宸ヤ綔鍙�
+ int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
+ // 鐢熸垚宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(now);
+ wrkMast.setWrkSts(101L); // 宸ヤ綔鐘舵�侊細101.鐢熸垚鍑哄簱
+ wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
+ wrkMast.setIoPri(13D); // 浼樺厛绾э細13
+ wrkMast.setSourceStaNo(staDesc.getDeviceStn()); // 婧愮珯
+ wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
+ wrkMast.setSourceLocNo(dto.getLocNo()); // 婧愬簱浣�
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setBarcode(locMast.getBarcode());
+ wrkMast.setAppeUser(String.valueOf(userId)); // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiUser(String.valueOf(userId));
+ wrkMast.setModiTime(now);
+ wrkMast.setHostId(hostId);
+ if (!wrkMastService.save(wrkMast)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細" + dto.getLocNo());
+ }
+ // 鐢熸垚宸ヤ綔妗ｆ槑缁�
+ for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
+ if (detlDto.getCount() == null || detlDto.getCount() <= 0.0D) {
+ continue;
+ }
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(detlDto.getLocDetl());
+ wrkDetl.setOrderNo(""); // 鎵嬪姩鍑哄簱涓嶉渶瑕佸甫鍑哄簱瀛樹腑鐨勫崟鎹紪鍙�
+ wrkDetl.setWrkNo(workNo);
+ wrkDetl.setIoTime(now);
+ Double anfme = ioType == 101 ? detlDto.getLocDetl().getAnfme() : detlDto.getCount();
+ wrkDetl.setAnfme(anfme); // 鏁伴噺
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setAppeUser(userId);
+ wrkDetl.setModiTime(now);
+ wrkDetl.setModiUser(userId);
+ wrkDetl.setWrkMastId(wrkMast.getId());
+ if (!wrkDetlService.save(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+ }
+ }
+ // 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
+ locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, dto.getLocNo()).eq(LocMast::getHostId, hostId));
+ if (locMast.getLocSts().equals("F")) {
+ locMast.setLocSts(ioType == 101 ? "R" : "P");
+ locMast.setModiUser(userId);
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)) {
+ throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細" + dto.getLocNo());
+ }
+ } else {
+ throw new CoolException(dto.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
+ }
+ }
+ }
+
+ @Override
+ @Transactional
public void completeWrkMast(String workNo, Long userId, Long hostId) {
WrkMast wrkMast = wrkMastService.getOne(new LambdaQueryWrapper<WrkMast>().eq(WrkMast::getWrkNo, workNo).eq(WrkMast::getHostId, hostId));
if (Cools.isEmpty(wrkMast)){
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java
index dac07bd..f7723e3 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java
@@ -1,6 +1,7 @@
package com.zy.asrs.wms.controller;
import com.zy.asrs.common.domain.param.FullStoreParam;
+import com.zy.asrs.common.domain.param.StockOutParam;
import com.zy.asrs.common.web.BaseController;
import com.zy.asrs.common.wms.service.BasDevpService;
import com.zy.asrs.common.wms.service.WorkService;
@@ -78,6 +79,13 @@
return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.startupFullPutStore(fullStoreParam, getUserId(), getHostId()));
}
+ @RequestMapping("/plate/out/start")
+ @ManagerAuth(memo = "鍑哄簱浣滀笟")
+ public R fullStoreTakeStart(@RequestBody StockOutParam param) {
+ workService.startupFullTakeStore(param, getUserId(), getHostId());
+ return R.ok("鍑哄簱鍚姩鎴愬姛");
+ }
+
@RequestMapping("/hand/control/wrkMast")
@ManagerAuth(memo = "鎵嬪姩澶勭悊宸ヤ綔妗�")
public R handControlWrkMast(@RequestParam String workNo,
--
Gitblit v1.9.1