From 756fa60cebfb82ba824e87d080d44fc9ec34ecc8 Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期二, 02 九月 2025 14:01:09 +0800
Subject: [PATCH] 订单出库显示明细是否完成修复
---
src/main/java/com/zy/asrs/controller/OutController.java | 338 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 294 insertions(+), 44 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 8cbcbed..379b1a9 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -1,24 +1,25 @@
package com.zy.asrs.controller;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.R;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.OrderDetl;
+import com.core.common.*;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.PakoutRequest;
+import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.*;
+import com.zy.common.model.LocDetlDto;
import com.zy.common.model.LocDto;
-import com.zy.common.model.TaskDto;
+import com.zy.common.model.enums.IoWorkType;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* Created by vincent on 2022/3/26
@@ -41,47 +42,136 @@
private WorkService workService;
@Autowired
private BasDevpService basDevpService;
+ @Autowired
+ private DocTypeService docTypeService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private MatService matService;
+
+ @PostMapping("/out/pakout/orderDetlIds/auth")
+ @ManagerAuth
+ public R pakoutOrderDetlIds(@RequestParam Long orderId) throws InterruptedException {
+ Thread.sleep(200);
+ return R.ok().add(orderDetlService.selectByOrderId(orderId).stream().map(OrderDetl::getId).distinct().collect(Collectors.toList()));
+ }
+ @PostMapping("/getMesOrder/auth")
+ @ManagerAuth
+ public R getMesOrder() {
+ List<String> orderNoList = orderService.getOrderNosByDocType(25L);
+ return R.ok().add(orderNoList);
+ }
@PostMapping("/out/pakout/preview/auth")
@ManagerAuth
public R pakoutPreview(@RequestBody List<Long> ids) {
if (Cools.isEmpty(ids)) {
return R.parse(BaseRes.PARAM);
}
+
List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
+ if (orderDetls.isEmpty()) {
+ return R.parse("璇烽�夋嫨鏁版嵁");
+ }
+
+ Order order = orderService.selectOne(
+ new EntityWrapper<Order>().eq("order_no", orderDetls.get(0).getOrderNo())
+ );
+ if (order == null) {
+ return R.parse("璁㈠崟鏁版嵁涓虹┖");
+ }
+
+ // 鎸夊寘瑁呯粍鍙峰垎缁勫鐞�
+ Map<String, List<OrderDetl>> brandGroup = orderDetls.stream()
+ .collect(Collectors.groupingBy(o -> {
+ String brand = o.getBrand();
+ return brand != null ? brand : "璺ㄥ贩閬�";
+ }));
+
+
List<LocDto> locDtos = new ArrayList<>();
- 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(), null);
- for (LocDetl locDetl : locDetls) {
- 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);
- locDto.setStaNos(staNos);
- locDtos.add(locDto);
- // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
- issued = issued - locDetl.getAnfme();
- } else {
- break;
- }
+
+ // 姣忎釜鍖呰缁勬煡涓�娆″簱瀛�
+ for (Map.Entry<String, List<OrderDetl>> entry : brandGroup.entrySet()) {
+ String brand = entry.getKey();
+ List<OrderDetl> brandOrderDetls = entry.getValue();
+
+ // 鏌ヨ繖涓寘瑁呯粍瀵瑰簲鐨勬墍鏈夊簱瀛�
+ List<LocDetl> locDetls = locDetlService.selectList(
+ new EntityWrapper<LocDetl>().eq("brand", brand)
+ );
+ if (locDetls.isEmpty()) continue;
+
+ // 鑾峰彇鍑哄簱鍙�
+ List<Integer> staNos = new ArrayList<>();
+ if (order.getDocType() == 21) {
+ staNos.add(3077); staNos.add(3106);
+ } else if (order.getDocType() == 22) {
+ staNos.add(2041);
+ } else if (order.getDocType() == 23) {
+ staNos.add(3092); staNos.add(3102); staNos.add(3095);
}
- if (issued > 0) {
- LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
- locDto.setLack(Boolean.TRUE);
+
+ // 鍘婚噸 key锛岄伩鍏嶇浉鍚� loc+unit+model 閲嶅鏄剧ず
+ Set<String> seen = new HashSet<>();
+
+ for (LocDetl locDetl : locDetls) {
+ String key = locDetl.getLocNo() + "|" + locDetl.getUnit() + "|" + locDetl.getModel();
+ if (seen.contains(key)) continue;
+ seen.add(key);
+
+ // 瀵瑰簲澶氫釜鏄庣粏鏃讹紝鍒嗛厤鍒扮涓�涓槑缁嗭紙鎴栦綘鍙互鎷嗗垎澶氫釜锛�
+ OrderDetl firstDetl = brandOrderDetls.get(0);
+
+ LocDto locDto = new LocDto();
+ locDto.setLocNo(locDetl.getLocNo());
+ locDto.setUnit(locDetl.getUnit());
+ locDto.setModel(locDetl.getModel());
+ locDto.setThreeCode(locDetl.getThreeCode());
+ locDto.setBrand(brand);
+ locDto.setOrderNo(firstDetl.getOrderNo());
+ locDto.setStaNos(staNos);
+ locDto.setOrderDetlId(firstDetl.getId());
+
locDtos.add(locDto);
}
}
+
+ return R.ok().add(locDtos);
+ }
+
+ @PostMapping("/out/refund/loc/preview/auth")
+ @ManagerAuth
+ public R refundLocPreview(@RequestBody List<Long> ids) {
+ if (Cools.isEmpty(ids)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ List<LocDto> locDtos = new ArrayList<>();
+ for (Long id : ids){
+ Order order = orderService.selectById(id);
+ List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+
+ for (OrderDetl orderDetl : orderDetls) {
+ LocDto locDto = new LocDto(orderDetl.getManu(), orderDetl.getMatnr(), orderDetl.getMaktx(),orderDetl.getModel(),orderDetl.getSpecs(),
+ orderDetl.getBatch(),orderDetl.getBrand(),orderDetl.getBarcode(), orderDetl.getOrderNo(),orderDetl.getAnfme());
+ locDto.setOrderDetlId(orderDetl.getId());
+ locDto.setTkType(orderDetl.getTkType());
+ locDtos.add(locDto);
+ }
+ }
+
return R.ok().add(locDtos);
}
@PostMapping("/out/pakout/auth")
@ManagerAuth(memo = "璁㈠崟鍑哄簱")
- public synchronized R pakout(@RequestBody List<LocDto> locDtos) throws InterruptedException {
+ public synchronized R pakout(@RequestBody PakoutRequest request) throws InterruptedException {
+ List<LocDto> locDtos = request.getTableCache();
+ String optionValue = request.getOptionValue();
if (Cools.isEmpty(locDtos)) {
return R.parse(BaseRes.PARAM);
}
+
boolean lack = true;
for (LocDto locDto : locDtos) {
if (!locDto.isLack()) {
@@ -95,24 +185,184 @@
Thread.sleep(1000L);
- List<TaskDto> taskDtos = new ArrayList<>();
- // 鏍规嵁 锛堝簱浣� & 鍑哄簱绔欙級 鍒嗙粍锛� 鐞嗘兂鐘舵�侊細涓�缁勪负涓�娆″嚭搴撲换鍔�
+ List<StockOutParam> stockOutParams = new ArrayList<>();
+ Map<Integer, StockOutParam> staNoMap = new HashMap<>();
+ Set<String> processedKeys = new HashSet<>(); // 闃叉閲嶅娣诲姞 brand+staNo
+
for (LocDto locDto : locDtos) {
- if (locDto.isLack()) { continue; }
- TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto);
- if (TaskDto.has(taskDtos, taskDto)) {
- TaskDto dto = TaskDto.find(taskDtos, taskDto);
- assert dto != null;
- dto.getLocDtos().addAll(taskDto.getLocDtos());
- } else {
- taskDtos.add(taskDto);
+ Integer staNo = locDto.getStaNo();
+ String brand = locDto.getBrand();
+ String key = staNo + "_" + brand;
+
+ // 鑾峰彇鎴栧垱寤� StockOutParam锛堟寜鍑哄簱鍙ｅ悎骞讹級
+ StockOutParam stockOutParam = staNoMap.get(staNo);
+ if (stockOutParam == null) {
+ stockOutParam = new StockOutParam();
+ stockOutParam.setOutSite(staNo);
+ stockOutParam.setOrderNo(locDto.getOrderNo());
+ stockOutParam.setLocDetls(new ArrayList<>());
+ stockOutParams.add(stockOutParam);
+ staNoMap.put(staNo, stockOutParam);
+ }
+
+ // 閬垮厤閲嶅娣诲姞鐩稿悓brand鐨勬暟鎹�
+ if (processedKeys.contains(key)) continue;
+ processedKeys.add(key);
+
+ List<LocDetl> locDetls1 = locDetlService.selectList(
+ new EntityWrapper<LocDetl>().eq("brand", brand));
+ for (LocDetl locDetl : locDetls1) {
+ StockOutParam.LocDetl detl = new StockOutParam.LocDetl();
+ detl.setLocNo(locDetl.getLocNo());
+ detl.setBrand(locDetl.getBrand());
+ detl.setModel(locDetl.getModel());
+ detl.setCount(locDetl.getAnfme());
+ stockOutParam.getLocDetls().add(detl);
}
}
- // -----------------------------------------------------------------------------------------------
- for (TaskDto taskDto : taskDtos) {
- BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
- workService.stockOut(staNo, taskDto, getUserId());
+
+ // 鎵ц鍑哄簱閫昏緫
+ for (StockOutParam stockOutParam : stockOutParams) {
+ BasDevp staNo = basDevpService.checkSiteStatus(stockOutParam.getOutSite());
+
+ List<LocDetlDto> locDetlDtos = new ArrayList<>();
+ for (StockOutParam.LocDetl paramLocDetl : stockOutParam.getLocDetls()) {
+ LocDetl one = locDetlService.selectOne(new EntityWrapper<LocDetl>()
+ .eq("loc_no", paramLocDetl.getLocNo())
+ .eq("brand", paramLocDetl.getBrand())
+ .eq("model", paramLocDetl.getModel()));
+
+ if (one != null) {
+ // 鍒ゆ柇鏄惁涓虹洏鐐瑰崟锛坉ocType == 23锛夛紝濡傛灉涓嶆槸鍒欐牎楠屽悎鏍兼��
+ Order order = orderService.selectByNo(stockOutParam.getOrderNo());
+ if ( order.getDocType() != 23) {
+ if (!"鍚堟牸".equals(one.getThreeCode())) {
+ throw new CoolException(one.getModel() + "鍗蜂笉鍚堟牸: " + one.getThreeCode());
+ }
+ }
+
+ locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), stockOutParam.getOrderNo()));
+ }
+
+ }
+
+ if (!locDetlDtos.isEmpty()) {
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));
+ if ("F".equals(locMast.getLocSts()) || "D".equals(locMast.getLocSts())) {
+ Order order = orderService.selectByNo(stockOutParam.getOrderNo());
+ workService.stockOut(staNo, locDetlDtos,
+ order.getDocType() != null && order.getDocType() == 23
+ ? IoWorkType.CHECK_OUT : null,
+ getUserId(),optionValue);
+ } else {
+ throw new CoolException("鎵�閫夊簱浣嶇姸鎬佷笉涓篎/D锛屽簱浣嶅彿锛�" +
+ locMast.getLocNo() + "锛屽綋鍓嶇姸鎬侊細" +
+ locMast.getLocSts() + "-" + locMast.getLocSts$());
+ }
+ } else {
+ throw new CoolException("搴撳瓨涓嶅瓨鍦�");
+ }
}
+
+ return R.ok();
+ }
+
+
+
+ @PostMapping("/out/refund/loc/auth")
+ @ManagerAuth(memo = "璁㈠崟鍑哄簱")
+ public synchronized R refundLoc(@RequestBody List<LocDto> locDtos) throws InterruptedException {
+ Long userId = getUserId();
+ DocType docType = docTypeService.selectOrAdd("閫�璐у叆搴撳崟", Boolean.TRUE);
+ Date now = new Date();
+ long nowOrderNo = System.currentTimeMillis();
+ Order order = new Order(
+ String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+ "TK"+nowOrderNo, // 璁㈠崟缂栧彿
+ DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
+ docType.getDocId(), // 鍗曟嵁绫诲瀷
+ null, // 椤圭洰缂栧彿
+ null, //
+ null, // 璋冩嫧椤圭洰缂栧彿
+ null, // 鍒濆绁ㄦ嵁鍙�
+ null, // 绁ㄦ嵁鍙�
+ null, // 瀹㈡埛缂栧彿
+ null, // 瀹㈡埛
+ null, // 鑱旂郴鏂瑰紡
+ null, // 鎿嶄綔浜哄憳
+ null, // 鍚堣閲戦
+ null, // 浼樻儬鐜�
+ null, // 浼樻儬閲戦
+ null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
+ null, // 瀹炰粯閲戦
+ null, // 浠樻绫诲瀷
+ null, // 涓氬姟鍛�
+ null, // 缁撶畻澶╂暟
+ null, // 閭垂鏀粯绫诲瀷
+ null, // 閭垂
+ null, // 浠樻鏃堕棿
+ null, // 鍙戣揣鏃堕棿
+ null, // 鐗╂祦鍚嶇О
+ null, // 鐗╂祦鍗曞彿
+// 2L, // 璁㈠崟鐘舵��
+ 1L, // 璁㈠崟鐘舵��
+ 1, // 鐘舵��
+ userId, // 娣诲姞浜哄憳
+ now, // 娣诲姞鏃堕棿
+ userId, // 淇敼浜哄憳
+ now, // 淇敼鏃堕棿
+ null // 澶囨敞
+ );
+ if (!orderService.insert(order)) {
+ throw new CoolException("淇濆瓨璁㈠崟涓绘。澶辫触");
+ }
+ // 鍗曟嵁鏄庣粏妗�
+ int i=0;
+ List<LocDto> locDtosList = new ArrayList<>();
+ List<String> batchList = new ArrayList<>();
+ for (LocDto locDto : locDtos) {
+ if (!batchList.contains(locDto.getBatch())){
+ batchList.add(locDto.getBatch());
+ locDtosList.add(locDto);
+ }
+ }
+ for (LocDto locDto : locDtosList) {
+ i++;
+ Mat mat = matService.selectByMatnr(locDto.getMatnr());
+ if (Cools.isEmpty(mat)) {
+ throw new CoolException(locDto.getMatnr() + "鐗╂枡缂栫爜妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+ }
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.sync(mat);
+ orderDetl.setSuppCode(String.valueOf(i)); // 琛屽彿
+ orderDetl.setManu(locDto.getLocNo()); //搴撲綅鍙�
+ orderDetl.setBatch(locDto.getBatch()); //鏈ㄧ缂栫爜
+ orderDetl.setAnfme(locDto.getAnfme());//鍑哄簱鏁伴噺
+ orderDetl.setModel(locDto.getModel());//鎵规
+ orderDetl.setSpecs(locDto.getSpecs());//瑙勬牸
+ orderDetl.setBrand(locDto.getBrand());//鏈ㄧ绫诲瀷
+ orderDetl.setBarcode(locDto.getZpallet());//鏈ㄧ绫诲瀷
+// orderDetl.setWorkQty(locDetl.getAnfme());
+ orderDetl.setWorkQty(0.0);
+ orderDetl.setOrderId(order.getId());
+ orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setCreateBy(userId);
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(userId);
+ orderDetl.setUpdateTime(now);
+ orderDetl.setStatus(1);
+ orderDetl.setQty(0.0D);
+ if (!orderDetlService.insert(orderDetl)) {
+ throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+
+ OrderDetl orderDetl1 = orderDetlService.selectById(locDto.getOrderDetlId());
+ orderDetl1.setTkType(1);
+ orderDetlService.updateById(orderDetl1);
+
+ }
+
return R.ok();
}
--
Gitblit v1.9.1