From 3e284aaefaea68f8a51a97b7e1d94d7b784de26c Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 10 一月 2024 11:24:46 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java | 2
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/StaDescServiceImpl.java | 13 +
zy-asrs-common/src/main/resources/mapper/wms/LocDetlMapper.xml | 72 -------
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/LocDetlMapper.java | 4
zy-asrs-common/src/main/resources/mapper/wms/StaDescMapper.xml | 12 -
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OutController.java | 84 ++++++++
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocDetlServiceImpl.java | 9
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WorkService.java | 3
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/LocDetlService.java | 2
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/StaDescService.java | 2
zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/TaskDto.java | 129 ++++++++++++++
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java | 99 +++++++++++
zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/OrderDto.java | 49 +++++
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/StaDescMapper.java | 2
14 files changed, 382 insertions(+), 100 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/OrderDto.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/OrderDto.java
new file mode 100644
index 0000000..07e8acb
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/OrderDto.java
@@ -0,0 +1,49 @@
+package com.zy.asrs.common.domain.dto;
+
+import com.zy.asrs.framework.common.Cools;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Created by vincent on 2022/8/18
+ */
+@Data
+public class OrderDto {
+
+ private String orderNo;
+
+ private String matnr;
+
+ private Double anfme;
+
+ public OrderDto(String orderNo, String matnr, Double anfme) {
+ this.orderNo = orderNo;
+ this.matnr = matnr;
+ this.anfme = anfme;
+ }
+
+ public static boolean has(List<OrderDto> list, OrderDto dto) {
+ if (Cools.isEmpty(list)) {
+ return false;
+ }
+ for (OrderDto orderDto : list) {
+ if (dto.getOrderNo().equals(orderDto.getOrderNo()) && dto.getMatnr().equals(orderDto.getMatnr())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public static OrderDto find(List<OrderDto> list, OrderDto dto) {
+ if (Cools.isEmpty(list)) {
+ return null;
+ }
+ for (OrderDto orderDto : list) {
+ if (dto.getOrderNo().equals(orderDto.getOrderNo()) && dto.getMatnr().equals(orderDto.getMatnr())) {
+ return orderDto;
+ }
+ }
+ return null;
+ }
+}
\ No newline at end of file
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/TaskDto.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/TaskDto.java
new file mode 100644
index 0000000..9cc4fae
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/TaskDto.java
@@ -0,0 +1,129 @@
+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 2022/3/28
+ */
+@Data
+public class TaskDto {
+
+ private String locNo;
+
+ private Integer staNo;
+
+ private Long hostId;
+
+ private List<LocDto> locDtos;
+
+ {
+ locDtos = new ArrayList<>();
+ }
+
+ public TaskDto(String locNo, Integer staNo, Long hostId) {
+ this.locNo = locNo;
+ this.staNo = staNo;
+ this.hostId = hostId;
+ }
+
+ public TaskDto(String locNo, Integer staNo, LocDto locDto, Long hostId) {
+ this.locNo = locNo;
+ this.staNo = staNo;
+ this.locDtos.add(locDto);
+ this.hostId = hostId;
+ }
+
+ public TaskDto(String locNo, Integer staNo, List<LocDto> locDtos, Long hostId) {
+ this.locNo = locNo;
+ this.staNo = staNo;
+ this.locDtos = locDtos;
+ this.hostId = hostId;
+ }
+
+ public static boolean has(List<TaskDto> list, TaskDto dto) {
+ if (Cools.isEmpty(list)) {
+ return false;
+ }
+ for (TaskDto taskDto : list) {
+ if (dto.getLocNo().equals(taskDto.getLocNo()) && taskDto.getStaNo().equals(dto.getStaNo())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public static TaskDto find(List<TaskDto> list, TaskDto dto) {
+ if (Cools.isEmpty(list)) {
+ return null;
+ }
+ for (TaskDto taskDto : list) {
+ if (dto.getLocNo().equals(taskDto.getLocNo()) && taskDto.getStaNo().equals(dto.getStaNo())) {
+ return taskDto;
+ }
+ }
+ return null;
+ }
+
+ public boolean isAll(){
+ // 姹囨�讳笉鑰冭檻搴忓垪鐮�
+ List<DetlDto> detlDtos = new ArrayList<>();
+ for (LocDto locDto : this.getLocDtos()) {
+ DetlDto dto = new DetlDto(locDto.getMatnr(), locDto.getBatch(), locDto.getAnfme());
+ if (DetlDto.has(detlDtos, dto)) {
+ DetlDto detlDto = DetlDto.find(detlDtos, locDto.getMatnr(), dto.getBatch());
+ assert detlDto != null;
+ detlDto.setAnfme(detlDto.getAnfme() + locDto.getAnfme());
+ } else {
+ detlDtos.add(new DetlDto(locDto.getMatnr(), locDto.getBatch(), locDto.getAnfme()));
+ }
+ }
+
+ // 鏌ヨ褰撳墠搴撲綅鍙锋墍鏈夌殑搴撳瓨鏄庣粏
+ LocDetlService locDetlService = SpringUtils.getBean(LocDetlService.class);
+ List<LocDetl> locDetls = locDetlService.list(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocNo, this.locNo).eq(LocDetl::getHostId, hostId));
+ if (locDetls == null || locDetls.isEmpty()){
+ throw new CoolException("妫�绱㈠簱瀛樻槑缁嗗け璐ワ紝搴撲綅鍙�=" + this.locNo);
+ }
+ int sameNumber = 0;
+ for (LocDetl locDetl : locDetls) {
+ Iterator<DetlDto> iterator = detlDtos.iterator();
+ while (iterator.hasNext()) {
+ DetlDto dto = iterator.next();
+ if (!dto.getMatnr().equals(locDetl.getMatnr())) {
+ continue;
+ }
+ if (Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(locDetl.getBatch())) {
+ continue;
+ }
+ if (!Cools.isEmpty(dto.getBatch()) && Cools.isEmpty(locDetl.getBatch())) {
+ continue;
+ }
+ if (!Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(locDetl.getBatch())) {
+ if (!dto.getBatch().equals(locDetl.getBatch())) {
+ continue;
+ }
+ }
+ if (dto.getAnfme() > locDetl.getAnfme()) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ }
+ if (dto.getAnfme().equals(locDetl.getAnfme())) {
+ sameNumber++;
+ iterator.remove();
+ break;
+ }
+ }
+ }
+ return sameNumber == locDetls.size();
+ }
+
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/StaDescService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/StaDescService.java
index 5890047..3c676be 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/StaDescService.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/StaDescService.java
@@ -7,6 +7,6 @@
public interface StaDescService extends IService<StaDesc> {
- List<Integer> queryOutStaNosByLocNo(String locNo, Integer typeNo);
+ List<Integer> queryOutStaNosByLocNo(String locNo, Integer typeNo, Long hostId);
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/StaDescServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/StaDescServiceImpl.java
index bfa2b6b..de4844b 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/StaDescServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/StaDescServiceImpl.java
@@ -1,19 +1,28 @@
package com.zy.asrs.common.sys.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.common.wms.mapper.StaDescMapper;
import com.zy.asrs.common.domain.entity.StaDesc;
import com.zy.asrs.common.sys.service.StaDescService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
@Service("staDescService")
public class StaDescServiceImpl extends ServiceImpl<StaDescMapper, StaDesc> implements StaDescService {
@Override
- public List<Integer> queryOutStaNosByLocNo(String locNo, Integer typeNo) {
- return this.baseMapper.queryOutStaNosByLocNo(locNo, typeNo);
+ public List<Integer> queryOutStaNosByLocNo(String locNo, Integer typeNo, Long hostId) {
+ ArrayList<Integer> list = new ArrayList<>();
+ LambdaQueryWrapper<StaDesc> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(StaDesc::getTypeNo, typeNo);
+ wrapper.eq(StaDesc::getHostId, hostId);
+ for (StaDesc staDesc : this.list(wrapper)) {
+ list.add(staDesc.getStnNo());
+ }
+ return list;
}
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/LocDetlMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/LocDetlMapper.java
index 935fb7c..10980cc 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/LocDetlMapper.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/LocDetlMapper.java
@@ -22,9 +22,7 @@
Integer sum();
- List<LocDetl> queryStock(@Param("matnr")String matnr, @Param("no") Integer no, @Param("orderBy") String orderBy, @Param("bay") Integer bay);
-
- List<QueryStockPreDo> queryStockPre(@Param("matnr")String matnr);
+ List<LocDetl> queryStock(@Param("matnr") String matnr, @Param("batch") String batch, @Param("hostId") Long hostId);
LocDetl selectItem(@Param("locNo") String locNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("hostId") Long hostId);
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/StaDescMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/StaDescMapper.java
index 795960d..c567423 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/StaDescMapper.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/StaDescMapper.java
@@ -12,6 +12,4 @@
@Repository
public interface StaDescMapper extends BaseMapper<StaDesc> {
- List<Integer> queryOutStaNosByLocNo(@Param("locNo") String locNo, @Param("typeNo") Integer typeNo);
-
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/LocDetlService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/LocDetlService.java
index 6fe9f29..14e8326 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/LocDetlService.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/LocDetlService.java
@@ -15,7 +15,7 @@
Integer sum();
- List<LocDetl> queryStock(String matnr, String batch, String lgort, Set<String> locNos);
+ List<LocDetl> queryStock(String matnr, String batch, Long hostId);
LocDetl selectItem(String locNo, String matnr, String batch, Long hostId);
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 cfc3226..b28307f 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,7 @@
package com.zy.asrs.common.wms.service;
import com.zy.asrs.common.domain.dto.LocDetlDto;
+import com.zy.asrs.common.domain.dto.TaskDto;
import com.zy.asrs.common.domain.enums.IoWorkType;
import com.zy.asrs.common.domain.param.FullStoreParam;
import com.zy.asrs.common.domain.param.LocDetlAdjustParam;
@@ -39,6 +40,8 @@
void stockOut(Integer staNo, List<LocDetlDto> locDetls, IoWorkType ioWorkType, Long userId, Long hostId);
+ void stockOut(Integer staNo, TaskDto taskDto, Long userId, Long hostId);
+
/**
* 搴撳瓨鏄庣粏璋冩暣
*/
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocDetlServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocDetlServiceImpl.java
index 6fbf6c4..95022ed 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocDetlServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocDetlServiceImpl.java
@@ -34,13 +34,8 @@
}
@Override
- public List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos) {
- List<LocDetl> result = new ArrayList<>();
- List<QueryStockPreDo> preDos = this.baseMapper.queryStockPre(matnr);
- for (QueryStockPreDo preDo : preDos) {
- List<LocDetl> locDetls = this.baseMapper.queryStock(matnr, preDo.getNo(), preDo.getOrderBy(), preDo.getBay());
- result.addAll(locDetls);
- }
+ public List<LocDetl> queryStock(String matnr, String batch, Long hostId) {
+ List<LocDetl> result = this.baseMapper.queryStock(matnr, batch, hostId);
return result;
}
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 f03eb75..7a6debb 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
@@ -54,6 +54,8 @@
private LocDetlService locDetlService;
@Autowired
private AdjDetlService adjDetlService;
+ @Autowired
+ private OrderService orderService;
@Override
@Transactional
@@ -235,6 +237,7 @@
wrkDetl.setAppeUser(userId);
wrkDetl.setModiTime(now);
wrkDetl.setModiUser(userId);
+ wrkDetl.setHostId(hostId);
wrkDetl.setWrkMastId(wrkMast.getId());
if (!wrkDetlService.save(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
@@ -257,6 +260,102 @@
@Override
@Transactional
+ public void stockOut(Integer staNo, TaskDto taskDto, Long userId, Long hostId) {
+ Date now = new Date();
+ List<LocDto> locDtos = taskDto.getLocDtos();
+ for (LocDto locDto : locDtos) {
+ if (!taskDto.getLocNo().equals(locDto.getLocNo()) && !taskDto.getStaNo().equals(locDto.getStaNo())) {
+ throw new CoolException("璁㈠崟鍑哄簱寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ }
+ }
+ // 鑾峰彇搴撲綅
+ LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>()
+ .eq(LocMast::getLocNo, taskDto.getLocNo())
+ .eq(LocMast::getHostId, hostId));
+ // 鑾峰彇璺緞
+ int ioType = taskDto.isAll() ? 101 : 103;
+ // 鑾峰彇璺緞
+ 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(taskDto.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("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細"+taskDto.getLocNo());
+ }
+ // 鐢熸垚宸ヤ綔妗ｆ槑缁�
+ for (LocDto locDto : taskDto.getLocDtos()) {
+ if (locDto.getAnfme()==null || locDto.getAnfme() <= 0.0D) { continue; }
+ Order order = orderService.getOne(new LambdaQueryWrapper<Order>()
+ .eq(Order::getOrderNo, locDto.getOrderNo())
+ .eq(Order::getHostId, hostId));
+ OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), locDto.getMatnr(), locDto.getBatch());
+ if (orderDetl == null) {
+ orderDetl = orderDetlService.selectItem(order.getId(), locDto.getMatnr(), null);
+ }
+ LocDetl locDetl = locDetlService.selectItem(locDto.getLocNo(), locDto.getMatnr(), locDto.getBatch(), hostId);
+ if (locDetl == null || locDetl.getAnfme() < locDto.getAnfme()) {
+ throw new CoolException(locDto.getLocNo() + "搴撲綅涓�" + locDto.getMatnr() + "鍟嗗搧搴撳瓨涓嶈冻锛�");
+ }
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(orderDetl);
+ wrkDetl.setZpallet(wrkMast.getBarcode());
+ wrkDetl.setIoTime(now);
+ wrkDetl.setWrkNo(workNo);
+ wrkDetl.setBatch(locDto.getBatch());
+ wrkDetl.setOrderNo(locDto.getOrderNo());
+ wrkDetl.setAnfme(locDto.getAnfme()); // 鏁伴噺
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setAppeUser(userId);
+ wrkDetl.setModiTime(now);
+ wrkDetl.setModiUser(userId);
+ wrkDetl.setHostId(hostId);
+ wrkDetl.setWrkMastId(wrkMast.getId());
+ if (!wrkDetlService.save(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+ }
+ // 淇敼璁㈠崟鏄庣粏
+ if (!orderDetlService.increase(orderDetl.getOrderId(), hostId, orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme())) {
+ throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
+ }
+ orderService.updateSettle(orderDetl.getOrderId(), 2L, userId, hostId);
+ }
+ // 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
+ locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>()
+ .eq(LocMast::getLocNo, taskDto.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("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+taskDto.getLocNo());
+ }
+ } else {
+ throw new CoolException(taskDto.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-common/src/main/resources/mapper/wms/LocDetlMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/LocDetlMapper.xml
index 39be9f2..1be8aea 100644
--- a/zy-asrs-common/src/main/resources/mapper/wms/LocDetlMapper.xml
+++ b/zy-asrs-common/src/main/resources/mapper/wms/LocDetlMapper.xml
@@ -59,77 +59,15 @@
select
a.*
from wms_loc_detl a
- left join common_loc_mast b on a.loc_no = b.loc_no
+ left join common_loc_mast b on a.loc_no = b.loc_no and a.host_id = b.host_id
where 1=1
- <if test="no!=null and no == 1">
- and b.row1 >= 31
- and b.row1 <= 32
- </if>
- <if test="no!=null and no == 2">
- and b.row1 >= 2
- and b.row1 <= 17
- </if>
- <if test="no!=null and no == 3">
- and b.row1 >= 18
- and b.row1 <= 30
- </if>
and a.matnr = #{matnr}
- and b.bay1 = #{bay}
+ <if test="batch!=null and batch!=''">
+ and a.batch = #{batch}
+ </if>
+ and b.host_id = #{hostId}
and b.loc_sts = 'F'
order by b.row1
- <if test="orderBy != null and orderBy != '' and orderBy == 'false'">
- desc
- </if>
- </select>
-
- <select id="queryStockPre" resultType="com.zy.asrs.common.domain.dto.QueryStockPreDo">
- select
- *
- from
- (
- select
- no = 1,
- orderBy = 'true',
- b.bay1 as bay,
- sum(anfme) as count
- from wms_loc_detl a
- left join common_loc_mast b on a.loc_no = b.loc_no
- where 1=1
- and b.loc_sts = 'F'
- and a.matnr = #{matnr}
- and b.row1 >= 31
- and b.row1 <= 32
- group by b.bay1
- union
- select
- no = 2,
- orderBy = 'true',
- b.bay1 as bay,
- sum(anfme) as count
- from wms_loc_detl a
- left join common_loc_mast b on a.loc_no = b.loc_no
- where 1=1
- and b.loc_sts = 'F'
- and a.matnr = #{matnr}
- and b.row1 >= 2
- and b.row1 <= 17
- group by b.bay1
- union
- select
- no = 3,
- orderBy = 'false',
- b.bay1 as bay,
- sum(anfme) as count
- from wms_loc_detl a
- left join common_loc_mast b on a.loc_no = b.loc_no
- where 1=1
- and b.loc_sts = 'F'
- and a.matnr = #{matnr}
- and b.row1 >= 18
- and b.row1 <= 30
- group by b.bay1
- ) a
- order by no, count desc
</select>
<select id="selectItem" resultType="com.zy.asrs.common.wms.entity.LocDetl">
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/StaDescMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/StaDescMapper.xml
index 125d6e7..1de9679 100644
--- a/zy-asrs-common/src/main/resources/mapper/wms/StaDescMapper.xml
+++ b/zy-asrs-common/src/main/resources/mapper/wms/StaDescMapper.xml
@@ -2,16 +2,4 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.common.wms.mapper.StaDescMapper">
- <select id="queryOutStaNosByLocNo" resultType="integer">
- select
- distinct asd.stn_no
- from wms_sta_desc asd
- left join wms_loc_mast alm on asd.crn_no = alm.crn_no
- where 1=1
- and alm.loc_no = #{locNo}
- <if test="typeNo != null and typeNo !=''">
- and asd.type_no = #{typeNo}
- </if>
- </select>
-
</mapper>
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java
index 893c0f0..92226a3 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java
@@ -190,7 +190,7 @@
wrkQty = wrkQty + orderDetl.getQty();
double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D);
if (issued > 0.0) {
- List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrigin(), null);
+ List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), hostId);
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
issued = issued - locDetl.getAnfme();
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OutController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OutController.java
index 1848497..4acd058 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OutController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OutController.java
@@ -1,10 +1,12 @@
package com.zy.asrs.wms.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.common.domain.dto.LocDto;
+import com.zy.asrs.common.domain.dto.OrderDto;
+import com.zy.asrs.common.domain.dto.TaskDto;
import com.zy.asrs.common.sys.service.StaDescService;
import com.zy.asrs.common.web.BaseController;
-import com.zy.asrs.common.wms.entity.LocDetl;
-import com.zy.asrs.common.wms.entity.OrderDetl;
+import com.zy.asrs.common.wms.entity.*;
import com.zy.asrs.common.wms.service.*;
import com.zy.asrs.framework.annotations.ManagerAuth;
import com.zy.asrs.framework.common.BaseRes;
@@ -45,6 +47,7 @@
if (Cools.isEmpty(ids)) {
return R.parse(BaseRes.PARAM);
}
+ Long hostId = getHostId();
List<OrderDetl> orderDetls = orderDetlService.listByIds(ids);
List<LocDto> locDtos = new ArrayList<>();
@@ -53,7 +56,7 @@
for (OrderDetl orderDetl : orderDetls) {
double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D);
if (issued <= 0.0D) { continue; }
- List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrigin(), exist);
+ List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), hostId);
for (LocDetl locDetl : locDetls) {
if (!Cools.isEmpty(locDetl.getMemo())){
continue;
@@ -61,7 +64,7 @@
if (issued > 0) {
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
- List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
+ List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103, hostId);
locDto.setStaNos(staNos);
locDtos.add(locDto);
exist.add(locDetl.getLocNo());
@@ -80,4 +83,77 @@
return R.ok().add(locDtos);
}
+ @PostMapping("/out/pakout/auth")
+ @ManagerAuth(memo = "璁㈠崟鍑哄簱")
+ public synchronized R pakout(@RequestBody List<LocDto> locDtos) throws InterruptedException {
+ if (Cools.isEmpty(locDtos)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ Long hostId = getHostId();
+ boolean lack = true;
+ for (LocDto locDto : locDtos) {
+ if (!locDto.isLack()) {
+ lack = false;
+ break;
+ }
+ }
+ if (lack) {
+ return R.error("搴撳瓨涓嶈冻");
+ }
+
+ Thread.sleep(500L);
+
+ // 璁㈠崟棰勬牎楠� ===>> 1.璁㈠崟鐘舵�侊紱 2.璁㈠崟甯﹀嚭鏁伴噺
+ List<OrderDto> orderDtos = new ArrayList<>();
+ for (LocDto locDto : locDtos) {
+ if (Cools.isEmpty(locDto.getOrderNo())) { continue; }
+ OrderDto orderDto = new OrderDto(locDto.getOrderNo(), locDto.getMatnr(), locDto.getAnfme());
+ if (OrderDto.has(orderDtos, orderDto)) {
+ OrderDto dto = OrderDto.find(orderDtos, orderDto);
+ assert dto != null;
+ dto.setAnfme(dto.getAnfme() + orderDto.getAnfme());
+ } else {
+ orderDtos.add(orderDto);
+ }
+ }
+ for (OrderDto orderDto : orderDtos) {
+ Order order = orderService.selectByNo(orderDto.getOrderNo(), hostId);
+ if (order.getSettle() > 2) {
+ return R.error(orderDto.getOrderNo() + "璁㈠崟宸插け鏁堬紝璇峰強鏃跺埛鏂伴〉闈�");
+ }
+ OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), orderDto.getMatnr(), null);
+ if (orderDetl.getAnfme() - orderDetl.getQty() < orderDto.getAnfme()) {
+ return R.ok(orderDto.getOrderNo() + "璁㈠崟宸蹭綔涓氾紝璇峰強鏃跺埛鏂伴〉闈�");
+ }
+ }
+
+ List<TaskDto> taskDtos = new ArrayList<>();
+ // 鏍规嵁 锛堝簱浣� & 鍑哄簱绔欙級 鍒嗙粍锛� 鐞嗘兂鐘舵�侊細涓�缁勪负涓�娆″嚭搴撲换鍔�
+ for (LocDto locDto : locDtos) {
+ if (locDto.isLack()) { continue; }
+ //2022-08-04 Add锛岄槻姝㈠墠绔〉闈㈡彁鍙栧簱浣嶄俊鎭悗锛屽湪鍏朵粬鍦版柟瀵硅搴撲綅鐢熸垚浜嗗嚭搴撲换鍔�(搴撲綅鐘舵�侀潪F鐘舵��)
+ LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>()
+ .eq(LocMast::getLocNo, locDto.getLocNo())
+ .eq(LocMast::getHostId, hostId));
+ if(!Cools.isEmpty(locMast) && !locMast.getLocSts().equals("F")){
+ return R.error("搴撲綅鍙烽潪鍦ㄥ簱鐘舵�侊紝璇烽噸鏂伴�夋嫨鍑哄簱搴撲綅===>>" + locDto.getLocNo());
+ }
+
+ TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto, hostId);
+ if (TaskDto.has(taskDtos, taskDto)) {
+ TaskDto dto = TaskDto.find(taskDtos, taskDto);
+ assert dto != null;
+ dto.getLocDtos().addAll(taskDto.getLocDtos());
+ } else {
+ taskDtos.add(taskDto);
+ }
+ }
+ // -----------------------------------------------------------------------------------------------
+ for (TaskDto taskDto : taskDtos) {
+ BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo(), false, hostId);
+ workService.stockOut(staNo.getDevNo(), taskDto, getUserId(), hostId);
+ }
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1