From 5e38c75bc9c609d5e41bf817756ef8ed7a0f4851 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 21 八月 2025 15:28:27 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/OutController.java | 330 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 275 insertions(+), 55 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 9f10466..a3db49b 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -1,21 +1,28 @@
package com.zy.asrs.controller;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.R;
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.entity.result.StoPreTab;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.annotations.ManagerAuth;
+import com.core.common.*;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.WorkServiceImpl;
+import com.zy.asrs.utils.OutboundAllocationUtil;
import com.zy.common.model.DetlDto;
import com.zy.common.model.LocDto;
+import com.zy.common.model.TaskDto;
import com.zy.common.web.BaseController;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
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.*;
+import java.util.stream.Collectors;
/**
* Created by vincent on 2022/3/26
@@ -24,6 +31,7 @@
@RestController
public class OutController extends BaseController {
+ private static final Logger log = LoggerFactory.getLogger(OutController.class);
@Autowired
private OrderService orderService;
@Autowired
@@ -34,41 +42,27 @@
private LocMastService locMastService;
@Autowired
private StaDescService staDescService;
+ @Autowired
+ private WorkService workService;
+ @Autowired
+ private BasDevpService basDevpService;
+ @Autowired
+ private DocTypeService docTypeService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private MatService matService;
-// @PostMapping("/out/pakout/preview/auth")
-// public R pakoutPreview(@RequestBody List<Long> ids) {
-// if (Cools.isEmpty(ids)) {
-// return R.parse(BaseRes.PARAM);
-// }
-// List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
-// Set<DetlDto> detlDtos = new HashSet<>();
-// for (OrderDetl orderDetl : orderDetls) {
-// if (DetlDto.hasList(detlDtos, orderDetl)) {
-// DetlDto detlDto = DetlDto.find(detlDtos, orderDetl.getMatnr(), orderDetl.getBatch());
-// assert detlDto != null;
-// detlDto.setAnfme(detlDto.getAnfme() + orderDetl.getAnfme());
-// } else {
-// detlDtos.add(new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getAnfme()));
-// }
-// }
-// List<LocDto> locDtos = new ArrayList<>();
-// for (DetlDto detlDto : detlDtos) {
-// double issued = Optional.ofNullable(detlDto.getAnfme()).orElse(0.0D) ;
-// List<LocDetl> locDetls = locDetlService.queryStock(detlDto.getMatnr(), detlDto.getBatch(), null);
-// for (LocDetl locDetl : locDetls) {
-// if (issued > 0) {
-// locDtos.add(new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), issued>=locDetl.getAnfme()?locDetl.getAnfme():issued));
-// // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
-// issued = issued - locDetl.getAnfme();
-// } else {
-// break;
-// }
-// }
-// }
-// return R.ok().add(locDtos);
-// }
+
+ @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("/out/pakout/preview/auth")
+ @ManagerAuth
public R pakoutPreview(@RequestBody List<Long> ids) {
if (Cools.isEmpty(ids)) {
return R.parse(BaseRes.PARAM);
@@ -76,28 +70,254 @@
List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
List<LocDto> locDtos = new ArrayList<>();
for (OrderDetl orderDetl : orderDetls) {
- double issued = Optional.ofNullable(orderDetl.getAnfme()).orElse(0.0D) ;
- 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;
- }
+ if (orderDetl.getAnfme()-orderDetl.getWorkQty()-orderDetl.getQty()==0.0){
+ continue;
}
- if (issued > 0) {
- LocDto locDto = new LocDto("缂鸿揣", orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
- locDto.setLack(Boolean.TRUE);
+ 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);
+ }
+
+
+
+
+// Set<String> exist = new HashSet<>();
+
+// for (OrderDetl orderDetl : orderDetls) {
+// double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
+// if (issued <= 0.0D) { continue; }
+// List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist);
+// 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);
+// exist.add(locDetl.getLocNo());
+// // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+// issued = issued - locDetl.getAnfme();
+// } else {
+// break;
+// }
+// }
+// if (issued > 0) {
+// LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
+// locDto.setLack(Boolean.TRUE);
+// 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 {
+ StockOutParam param = new StockOutParam();
+ ArrayList<StockOutParam.LocDetl> locDetls = new ArrayList<>();
+ for (LocDto locDto:locDtos){
+ Order order = orderService.selectByNo(locDto.getOrderNo());
+ OrderDetl orderDetl = orderDetlService.selectById(locDto.getOrderDetlId());
+
+ StockOutParam.LocDetl locDetl = new StockOutParam.LocDetl();
+ locDetl.setBrand(locDto.getBrand());
+ try{
+ LocDetl locDetl1 = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("batch", locDto.getBatch()));
+ locDetl.setLocNo(locDetl1.getLocNo());
+ }catch (Exception e){
+ log.error("璁㈠崟鍑哄簱搴撲綅鍙峰鐞嗗紓甯革細"+e);
+ locDetl.setLocNo(locDto.getLocNo());
+ }
+ locDetl.setAnfme(locDto.getAnfme());
+ locDetl.setMatnr(locDto.getMatnr());
+ locDetl.setBatch(locDto.getBatch());
+ locDetl.setModel(locDto.getModel());
+ locDetl.setSpecs(locDto.getSpecs());
+ locDetl.setZpallet(locDto.getZpallet());
+ locDetl.setMemo(orderDetl.getMemo());
+ locDetl.setColor(order.getCstmrName());
+
+ param.setOrderNo(locDto.getOrderNo());
+
+ locDetls.add(locDetl);
+ }
+ param.setLocDetls(locDetls);
+
+ List<StockOutParam> stockOutParams = OutboundAllocationUtil.OutboundClassification(param);
+ Date now = new Date();
+ for (StockOutParam stockOutParam : stockOutParams){
+ stockOutParam.setNowTime(now);
+ workService.startupFullTakeStore(stockOutParam, getUserId());
+ }
+
+ for (LocDto locDto:locDtos){
+ OrderDetl orderDetl = orderDetlService.selectById(locDto.getOrderDetlId());
+ orderDetl.setWorkQty(locDto.getAnfme());
+ orderDetlService.updateById(orderDetl);
+ }
+
+ Order order = orderService.selectByNo(param.getOrderNo());
+ order.setSettle(2L);
+ orderService.updateById(order);
+
+
+// if (Cools.isEmpty(locDtos)) {
+// return R.parse(BaseRes.PARAM);
+// }
+// boolean lack = true;
+// for (LocDto locDto : locDtos) {
+// if (!locDto.isLack()) {
+// lack = false;
+// break;
+// }
+// }
+// if (lack) {
+// return R.error("搴撳瓨涓嶈冻");
+// }
+//
+// Thread.sleep(1000L);
+//
+// List<TaskDto> taskDtos = new ArrayList<>();
+// // 鏍规嵁 锛堝簱浣� & 鍑哄簱绔欙級 鍒嗙粍锛� 鐞嗘兂鐘舵�侊細涓�缁勪负涓�娆″嚭搴撲换鍔�
+// 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);
+// }
+// }
+// // -----------------------------------------------------------------------------------------------
+// for (TaskDto taskDto : taskDtos) {
+// BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
+// workService.stockOut(staNo, taskDto, getUserId());
+// }
+ 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