From 07dad0e9ef89346439cfcfb5978b0f1cb8f1b512 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 27 五月 2025 12:31:30 +0800
Subject: [PATCH] 新增PDA并板操作
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 246 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 239 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 0f8a0f9..153765b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -5,25 +5,24 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.CombParam;
-import com.zy.asrs.entity.param.MobileAdjustParam;
-import com.zy.asrs.entity.param.OffSaleParam;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
+import com.zy.asrs.utils.MatCompareUtils;
import com.zy.common.model.DetlDto;
+import com.zy.common.model.LocDto;
import com.zy.common.service.CommonService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
/**
* 绉诲姩绔湇鍔℃牳蹇冪被
@@ -71,6 +70,8 @@
private ManLocDetlService manLocDetlService;
@Autowired
private ManLocDetlMapper manLocDetlMapper;
+ @Autowired
+ private AdjDetlService adjDetlService;
@Override
@@ -630,4 +631,235 @@
throw new CoolException(locDetl.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
}
}
+
+ /**
+ * 鎷ｆ枡閫斾腑骞舵澘鐩存帴鍔犲埌搴撳瓨涓�
+ * @param param
+ * @param userId
+ * @return
+ */
+ @Override
+ @Transactional
+ public R WarehouseOutPickMergeV1(WarehouseOutPickMergeParam param, Long userId) {
+ //鍒ゆ柇搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", param.getLocNo()));
+ if (Cools.isEmpty(locMast)){
+ return R.error("璇ュ簱浣嶄笉瀛樺湪");
+ }
+ if (!locMast.getLocSts().equals("P")){
+ return R.error("璇ュ簱浣嶇姸鎬佷负锛�"+locMast.getLocSts()+",涓嶆弧瓒虫嫞鏂欓�斾腑骞舵澘鏉′欢锛侊紒锛�");
+ }
+
+ HashMap<String, OrderDetl> mapData = new HashMap<>();
+ for (OrderDetl orderDetl : param.getCombMats()) {
+ String key = orderDetl.getMatnr();
+// private static final String[] sameFields = {"matnr", "batch", "outOrderNo", "luHao", "packing", "sPgNO", "proType","color"};
+ if (!Cools.isEmpty(orderDetl.getBatch())) {
+ key += "_" + orderDetl.getBatch();
+ }
+ if (!Cools.isEmpty(orderDetl.getOutOrderNo())) {
+ key += "_" + orderDetl.getOutOrderNo();
+ }
+ if (!Cools.isEmpty(orderDetl.getLuHao())) {
+ key += "_" + orderDetl.getLuHao();
+ }
+ if (!Cools.isEmpty(orderDetl.getPacking())) {
+ key += "_" + orderDetl.getPacking();
+ }
+ if (!Cools.isEmpty(orderDetl.getSPgNO())) {
+ key += "_" + orderDetl.getSPgNO();
+ }
+ if (!Cools.isEmpty(orderDetl.getProType())) {
+ key += "_" + orderDetl.getProType();
+ }
+ if (!Cools.isEmpty(orderDetl.getColor())) {
+ key += "_" + orderDetl.getColor();
+ }
+
+ OrderDetl value = mapData.get(key);
+ if(value == null){
+ mapData.put(key, orderDetl);
+ }else {
+ value.setAnfme(value.getAnfme() + orderDetl.getAnfme());
+ mapData.put(key, value);
+ }
+ }
+
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
+
+ HashMap<String, PickMergeDto> locData = new HashMap<>();
+ for (LocDetl locDetl : locDetls) {
+ String matKey = locDetl.getMatnr();
+ if (!Cools.isEmpty(locDetl.getBatch())) {
+ matKey += "_" + locDetl.getBatch();
+ }
+ if (!Cools.isEmpty(locDetl.getOutOrderNo())) {
+ matKey += "_" + locDetl.getOutOrderNo();
+ }
+ if (!Cools.isEmpty(locDetl.getLuHao())) {
+ matKey += "_" + locDetl.getLuHao();
+ }
+ if (!Cools.isEmpty(locDetl.getPacking())) {
+ matKey += "_" + locDetl.getPacking();
+ }
+ if (!Cools.isEmpty(locDetl.getSPgNO())) {
+ matKey += "_" + locDetl.getSPgNO();
+ }
+ if (!Cools.isEmpty(locDetl.getProType())) {
+ matKey += "_" + locDetl.getProType();
+ }
+ if (!Cools.isEmpty(locDetl.getColor())) {
+ matKey += "_" + locDetl.getColor();
+ }
+
+ PickMergeDto dto = new PickMergeDto();
+ dto.setOriginAnfme(locDetl.getAnfme());
+ dto.setLocDetl(locDetl);
+ dto.setOrders(new ArrayList<>());
+ locData.put(matKey, dto);
+ }
+
+ for (Map.Entry<String, OrderDetl> entry : mapData.entrySet()) {
+ OrderDetl orderDetl = entry.getValue();
+ LocDetl locDetl = new LocDetl();
+ locDetl.sync(orderDetl);
+ locDetl.setLocNo(param.getLocNo());
+ locDetl.setBarcode(locMast.getBarcode());
+ Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("matnr",locDetl.getMatnr()));
+ locDetl.setMaktx(mat.getMaktx());
+
+ String matKey = locDetl.getMatnr();
+ if (!Cools.isEmpty(locDetl.getBatch())) {
+ matKey += "_" + locDetl.getBatch();
+ }
+ if (!Cools.isEmpty(locDetl.getOutOrderNo())) {
+ matKey += "_" + locDetl.getOutOrderNo();
+ }
+ if (!Cools.isEmpty(locDetl.getLuHao())) {
+ matKey += "_" + locDetl.getLuHao();
+ }
+ if (!Cools.isEmpty(locDetl.getPacking())) {
+ matKey += "_" + locDetl.getPacking();
+ }
+ if (!Cools.isEmpty(locDetl.getSPgNO())) {
+ matKey += "_" + locDetl.getSPgNO();
+ }
+ if (!Cools.isEmpty(locDetl.getProType())) {
+ matKey += "_" + locDetl.getProType();
+ }
+ if (!Cools.isEmpty(locDetl.getColor())) {
+ matKey += "_" + locDetl.getColor();
+ }
+
+
+ PickMergeDto dto = locData.get(matKey);
+ if (dto == null) {
+ ArrayList<PickMergeOrderDto> orders = new ArrayList<>();
+ orders.add(new PickMergeOrderDto(locDetl.getOrderNo(), locDetl.getAnfme()));
+
+ dto = new PickMergeDto();
+ dto.setOriginAnfme(0.0);
+ dto.setLocDetl(locDetl);
+ dto.setOrders(orders);
+
+ locData.put(matKey, dto);
+ }else {
+ LocDetl detl = dto.getLocDetl();
+ List<PickMergeOrderDto> orders = dto.getOrders();
+
+ detl.setAnfme(detl.getAnfme() + locDetl.getAnfme());
+ orders.add(new PickMergeOrderDto(locDetl.getOrderNo(), locDetl.getAnfme()));
+
+ dto.setLocDetl(detl);
+ dto.setOrders(orders);
+
+ locData.put(matKey, dto);
+ }
+ }
+
+
+ for (Map.Entry<String, PickMergeDto> entry : locData.entrySet()) {
+ PickMergeDto dto = entry.getValue();
+
+ Double originAnfme = dto.getOriginAnfme();
+ LocDetl locDetl = dto.getLocDetl();
+ List<PickMergeOrderDto> orders = dto.getOrders();
+
+ Boolean b=false;
+ for (LocDetl detl : locDetls) {
+ b= MatCompareUtils.compare(detl, locDetl);
+ if (b) break;
+ }
+
+ if (b){
+ if (!locDetlService.updateAnfmeAdd(locDetl.getAnfme(),locDetl.getLocNo(),locDetl)) {
+ throw new CoolException("骞舵澘搴撳瓨鏇存柊澶辫触");
+ }
+ }else {
+ locDetl.setZpallet(locDetl.getBarcode());
+ if (!locDetlService.insert(locDetl)) {
+ throw new CoolException("骞舵澘搴撳瓨鎻掑叆澶辫触");
+ }
+ }
+
+ if (!orders.isEmpty()){
+ for (PickMergeOrderDto orderDto : orders) {
+ Order order = orderService.selectByNo(orderDto.getOrderNo());
+ if (Cools.isEmpty(order)){
+ continue;
+ }
+ if (order.getSettle() == 1){
+ orderService.updateSettle(order.getId(), 2L, 9527L);
+ }
+
+
+ LocDto locDto = new LocDto(locDetl.getOrderNo(),locDetl.getMatnr(),locDetl.getBatch(),locDetl.getOutOrderNo(),locDetl.getLuHao(),locDetl.getPacking(),locDetl.getSPgNO(),locDetl.getProType(),locDetl.getColor());
+ OrderDetl orderDetl = orderDetlService.selectItem(locDto);
+ if (Cools.isEmpty(orderDetl)){
+ continue;
+ }
+ if (orderDetl.getAnfme() < (orderDetl.getWorkQty() + orderDto.getAnfme())) {
+ throw new CoolException("骞舵澘鏁伴噺鍑洪敊,璁㈠崟鍓╀綑鍑哄簱鏁伴噺灏忎簬宸插嚭搴撴暟閲忎笌灏嗗苟鏉挎暟閲忎箣鍜岋紒锛侊紒");
+ }
+ // 淇敼璁㈠崟鏄庣粏浣滀笟鏁伴噺
+ if (!orderDetlService.increaseWorkQtyByOrderNo(orderDto.getOrderNo(), orderDetl, orderDto.getAnfme())) {
+ throw new CoolException("淇敼鍗曟嵁鏄庣粏宸ヤ綔鏁伴噺澶辫触");
+ }
+ // 淇敼璁㈠崟鏄庣粏瀹屾垚鏁伴噺
+ if (!orderDetlService.increaseQtyByOrderNo1(orderDto.getOrderNo(), orderDetl, orderDto.getAnfme())) {
+ throw new CoolException("淇敼鍗曟嵁鏄庣粏瀹屾垚鏁伴噺澶辫触");
+ }
+ // 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴�
+ orderService.checkComplete(orderDto.getOrderNo());
+
+ try {
+ //澶勭悊搴撳瓨淇℃伅
+ AdjDetl adjDetl = new AdjDetl();
+ adjDetl.setLocNo(locDetl.getLocNo());
+ adjDetl.setMatnr(locDetl.getMatnr());
+ adjDetl.setBatch(locDetl.getBatch());
+ adjDetl.setOriQty(originAnfme);
+ adjDetl.setAdjQty(locDetl.getAnfme());
+ adjDetl.setMemo("鎷ｆ枡閫斾腑骞舵澘");
+ adjDetl.setModiUser(userId);
+ adjDetl.setAppeUser(userId);
+ adjDetl.setAppeTime(new Date());
+ adjDetl.setModiTime(new Date());
+ adjDetl.setExpand(locDetl);//瀵规墿鍏呰繘琛屾嫾鎺�
+ adjDetl.setOrderNo(order.getOrderNo());
+
+ if (!adjDetlService.save(adjDetl,userId)) {
+ throw new CoolException("淇濆瓨搴撳瓨璋冩暣璁板綍澶辫触");
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ throw new CoolException("鏇存柊搴撳瓨鏁版嵁鍑洪敊" + e.getMessage());
+ }
+ }
+ }
+
+
+ }
+ return R.ok();
+ }
}
--
Gitblit v1.9.1