From 396dfb3eba1725868ab2e01d7c1af5e64bf108d3 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期日, 30 三月 2025 21:18:04 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/OutController.java | 445 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 268 insertions(+), 177 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index f851843..eaada3a 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -6,6 +6,7 @@
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
+import com.zy.asrs.constant.AsrsConstants;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.common.model.LocDto;
@@ -13,6 +14,8 @@
import com.zy.common.model.OrderMergeVo;
import com.zy.common.model.TaskDto;
import com.zy.common.web.BaseController;
+import com.zy.system.service.ConfigService;
+import lombok.Synchronized;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -53,9 +56,18 @@
private ManLocDetlService manLocDetlService;
@Autowired
private ManPakOutService manPakOutService;
+ @Autowired
+ private DocTypeService docTypeService;
@Autowired
private AgvLocDetlService agvLocDetlService;
+
+ @Autowired
+ private ConfigService configService;
+
+
+ @Autowired
+ private AgvWrkMastService agvWrkMastService;
@PostMapping("/out/pakout/orderDetlIds/auth")
@ManagerAuth
@@ -75,22 +87,144 @@
for (OrderDetl orderDetl : orderDetlList) {
double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D);
- if (issued <= 0.0D) { continue; }
+ Order order = orderService.selectByNo(orderDetl.getOrderNo());
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if ("浜哄伐琛ヨ揣鍗�".equals(docType.getDocName())) {
+ if (issued <= 0.0D) {
+ continue;
+ }
+ issued = locDetlService.queryStockAndSetLocDto1(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrderNo(), locDtoList, issued, orderDetl.getThreeCode(), orderDetl.getDeadTime());
+ if (issued > 0) {
+ LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued, orderDetl.getProcessSts());
+ locDto.setLack(Boolean.TRUE);
+ locDtoList.add(locDto);
+ }
+ } else {
+ if (issued <= 0.0D) {
+ continue;
+ }
- //浠庡钩搴撳鎵�
- issued = manLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());
+ //浠庡钩搴撳鎵�
+ //issued = manLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());
- //鍏堟壘AGV鐨勫簱瀛橈紝濡傛灉杩斿洖鐨刬ssued澶т簬0锛屽垯鍘诲洓椤瑰簱鎵�
- issued = agvLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());
+ //鍏堟壘AGV鐨勫簱瀛橈紝濡傛灉杩斿洖鐨刬ssued澶т簬0锛屽垯鍘诲洓椤瑰簱鎵�
+ issued = agvLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrderNo(), locDtoList, issued, orderDetl.getThreeCode(), orderDetl.getDeadTime(), null);
- //浠庡洓椤瑰簱鐨勫簱瀛橀噷闈㈡壘锛�
- issued = locDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());
+ //浠庡洓椤瑰簱鐨勫簱瀛橀噷闈㈡壘锛�
+ //issued = locDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());
- if (issued > 0) {
- LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
- locDto.setLack(Boolean.TRUE);
- locDtoList.add(locDto);
+ if (issued > 0) {
+ LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued, orderDetl.getProcessSts());
+ locDto.setLack(Boolean.TRUE);
+ locDtoList.add(locDto);
+ }
}
+
+
+ }
+ return R.ok().add(locDtoList);
+
+ }
+
+ //鍑哄簱
+ @PostMapping("/bcp/out/pakout/preview/auth")
+ @ManagerAuth
+ public R bcpPakoutPreview(@RequestBody List<Long> ids) {
+
+ List<OrderDetl> orderDetlList = orderDetlService.selectBatchIds(ids);
+ //杩斿洖缁欏墠绔殑搴撲綅浠ュ強绔欑偣淇℃伅
+ List<LocDto> locDtoList = new ArrayList<>();
+
+ for (OrderDetl orderDetl : orderDetlList) {
+ double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D);
+ Order order = orderService.selectByNo(orderDetl.getOrderNo());
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if ("浜哄伐琛ヨ揣鍗�".equals(docType.getDocName())) {
+ if (issued <= 0.0D) {
+ continue;
+ }
+ issued = locDetlService.queryStockAndSetLocDto1(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrderNo(), locDtoList, issued, orderDetl.getThreeCode(), orderDetl.getDeadTime());
+ if (issued > 0) {
+ LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued, orderDetl.getProcessSts());
+ locDto.setLack(Boolean.TRUE);
+ locDtoList.add(locDto);
+ }
+ } else {
+ if (issued <= 0.0D) {
+ continue;
+ }
+
+ //浠庡钩搴撳鎵�
+ //issued = manLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());
+
+ //鍏堟壘AGV鐨勫簱瀛橈紝濡傛灉杩斿洖鐨刬ssued澶т簬0锛屽垯鍘诲洓椤瑰簱鎵�
+ issued = agvLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrderNo(), locDtoList, issued, orderDetl.getThreeCode(), orderDetl.getDeadTime(), "bcp");
+
+ //浠庡洓椤瑰簱鐨勫簱瀛橀噷闈㈡壘锛�
+ //issued = locDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());
+
+ if (issued > 0) {
+ LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued, orderDetl.getProcessSts());
+ locDto.setLack(Boolean.TRUE);
+ locDtoList.add(locDto);
+ }
+ }
+
+
+ }
+ return R.ok().add(locDtoList);
+
+ }
+
+ /**
+ * 浜屽巶
+ * @param ids
+ * @return
+ */
+ @PostMapping("/bcp/out/pakout/preview/auth/v2")
+ @ManagerAuth
+ public R bcpPakoutPreviewV2(@RequestBody List<Long> ids) {
+
+ List<OrderDetl> orderDetlList = orderDetlService.selectBatchIds(ids);
+ //杩斿洖缁欏墠绔殑搴撲綅浠ュ強绔欑偣淇℃伅
+ List<LocDto> locDtoList = new ArrayList<>();
+
+ for (OrderDetl orderDetl : orderDetlList) {
+ double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D);
+ Order order = orderService.selectByNo(orderDetl.getOrderNo());
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if ("浜哄伐琛ヨ揣鍗�".equals(docType.getDocName())) {
+ if (issued <= 0.0D) {
+ continue;
+ }
+ issued = locDetlService.queryStockAndSetLocDto1(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrderNo(), locDtoList, issued, orderDetl.getThreeCode(), orderDetl.getDeadTime());
+ if (issued > 0) {
+ LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued, orderDetl.getProcessSts());
+ locDto.setLack(Boolean.TRUE);
+ locDtoList.add(locDto);
+ }
+ } else {
+ if (issued <= 0.0D) {
+ continue;
+ }
+
+ //浠庡钩搴撳鎵�
+ //issued = manLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());
+
+ //鍏堟壘AGV鐨勫簱瀛橈紝濡傛灉杩斿洖鐨刬ssued澶т簬0锛屽垯鍘诲洓椤瑰簱鎵�
+ issued = agvLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrderNo(), locDtoList, issued, orderDetl.getThreeCode(), orderDetl.getDeadTime(), AsrsConstants.ERCHANG);
+
+ //浠庡洓椤瑰簱鐨勫簱瀛橀噷闈㈡壘锛�
+ //issued = locDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());
+
+ if (issued > 0) {
+ LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued, orderDetl.getProcessSts());
+ locDto.setLack(Boolean.TRUE);
+ locDtoList.add(locDto);
+ }
+ }
+
+
}
return R.ok().add(locDtoList);
@@ -99,14 +233,49 @@
@PostMapping("/out/pakout/auth")
@ManagerAuth(memo = "璁㈠崟鍑哄簱")
@Transactional
+ @Synchronized
public synchronized R pakout(@RequestBody List<LocDto> locDtos) throws InterruptedException {
+ for (LocDto locDto : locDtos) {
+ if (locDto.getAnfme() == 0) {
+ return R.error(locDto.getMatnr() + "锛氬嚭搴撴暟閲忎负0");
+ }
+ }
//鍒ゆ柇鏄惁鍙互鐢熸垚鍑哄簱宸ヤ綔妗�
boolean lack = true;
for (LocDto locDto : locDtos) {
//濡傛灉AGV鍑哄簱绔欎负绌� 鍜� 鍥涢」搴撳嚭搴撶珯涓虹┖ 骞朵笖 鏈夊簱瀛樼殑鎯呭喌涓� 鍒欒繑鍥�
- if (Cools.isEmpty(locDto.getStaNo()) && Cools.isEmpty(locDto.getAgvStaNo()) &&!locDto.isLack()) {
- return R.error(locDto.getLocNo()+"搴撲綅璇烽�夋嫨鍑哄簱绔�");
+ if (Cools.isEmpty(locDto.getStaNo()) && Cools.isEmpty(locDto.getAgvStaNo()) && !locDto.isLack()) {
+ return R.error(locDto.getLocNo() + "搴撲綅璇烽�夋嫨鍑哄簱绔�");
+ }
+
+ AgvLocMast agvLocMast = agvLocMastService.selectById(locDto.getLocNo());
+ List<String> staNoList = agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1());
+
+
+// Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "FOUR"));
+// if (config != null) {
+// if (config.getStatus().intValue() == 1) {
+// List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().eq("source_loc_no", locDto.getAgvStaNo()));
+// if (agvWrkMasts != null && !agvWrkMasts.isEmpty()) {
+// for (AgvWrkMast agvWrkMast : agvWrkMasts) {
+// if (agvWrkMast.getWrkSts() < 204) {
+// return R.error(locDto.getAgvStaNo() + "璇ョ珯鐐瑰凡鏈変换鍔★紝绛変换鍔″畬鎴愭垨鑰呰揣鏋舵惉璧板啀鍙枡");
+// }
+// }
+// }
+// }
+// }
+
+
+ if (!staNoList.contains(locDto.getAgvStaNo())) {
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locDto.getAgvStaNo()));
+ if (Cools.isEmpty(agvWrkMast.getPdcType())) {
+ return R.error(locDto.getAgvStaNo() + "璇ョ珯鐐瑰凡鏈夊嚭搴撲换鍔�,宸ヤ綔鍙凤細" + agvWrkMast.getWrkNo() + ",鐗╂枡搴撲綅鍙凤細" + agvWrkMast.getSourceLocNo() + ",浠诲姟鐘舵�侊細" + agvWrkMast.getWrkSts$());
+ } else {
+ return R.error(locDto.getAgvStaNo() + "璇ョ珯鐐瑰凡鏈夊嚭搴撲换鍔�,宸ヤ綔鍙凤細" + agvWrkMast.getWrkNo() + ",鐗╂枡搴撲綅鍙凤細" + agvWrkMast.getSourceLocNo() + ",浠诲姟鐘舵�侊細" + agvWrkMast.getWrkSts$() + ",灏忚溅缂栧彿锛�" + agvWrkMast.getPdcType());
+
+ }
}
}
//濡傛灉鎵�鏈夊簱閮芥病鏈夊簱瀛橈紝鍒欒繑鍥�
@@ -126,29 +295,43 @@
List<TaskDto> taskDtos = new ArrayList<>();
List<TaskDto> agvTaskDtos = new ArrayList<>();
- generateTaskDto(locDtos,taskDtos,agvTaskDtos);
+ generateTaskDto(locDtos, taskDtos, agvTaskDtos);
//鐢熸垚AGV鍑哄簱浠诲姟
agvWorkService.stockOutWrkMast(agvTaskDtos, getUserId());
// 鐢熸垚鍑哄簱浠诲姟
- List<String> excludeLocNos = taskDtos.stream().map(TaskDto::getLocNo).distinct().collect(Collectors.toList());
+ taskDtos.stream().map(TaskDto::getLocNo).distinct().collect(Collectors.toList());
for (TaskDto taskDto : taskDtos) {
BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
workService.stockOut(staNo, taskDto, getUserId());
}
return R.ok();
+ }
- /*
- if (Cools.isEmpty(locDtos)) {
- return R.parse(BaseRes.PARAM);
- }
+ @PostMapping("/process/out/pakout/auth")
+ @ManagerAuth(memo = "鍔犲伐鍑哄簱")
+ @Transactional
+ @Synchronized
+ public synchronized R processPakout(@RequestBody List<LocDto> locDtos) throws InterruptedException {
+
+ //鍒ゆ柇鏄惁鍙互鐢熸垚鍑哄簱宸ヤ綔妗�
boolean lack = true;
for (LocDto locDto : locDtos) {
- if (Cools.isEmpty(locDto.getStaNo()) && !locDto.isLack()) {
- return R.error(locDto.getLocNo()+"搴撲綅璇烽�夋嫨鍑哄簱绔�");
+ //濡傛灉AGV鍑哄簱绔欎负绌� 鍜� 鍥涢」搴撳嚭搴撶珯涓虹┖ 骞朵笖 鏈夊簱瀛樼殑鎯呭喌涓� 鍒欒繑鍥�
+ if (Cools.isEmpty(locDto.getStaNo()) && Cools.isEmpty(locDto.getAgvStaNo()) && !locDto.isLack()) {
+ return R.error(locDto.getLocNo() + "搴撲綅璇烽�夋嫨鍑哄簱绔�");
}
+
+ AgvLocMast agvLocMast = agvLocMastService.selectById(locDto.getLocNo());
+ List<String> staNoList = agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1(), agvLocMast.getFloor());
+
+ if (!staNoList.contains(locDto.getAgvStaNo())) {
+ return R.error(locDto.getAgvStaNo() + "璇ョ珯鐐瑰凡鏈夊嚭搴撲换鍔★紝鏃犳硶閫夋嫨璇ョ珯鐐瑰嚭搴�");
+ }
+
}
+ //濡傛灉鎵�鏈夊簱閮芥病鏈夊簱瀛橈紝鍒欒繑鍥�
for (LocDto locDto : locDtos) {
if (!locDto.isLack()) {
lack = false;
@@ -158,76 +341,19 @@
if (lack) {
return R.error("搴撳瓨涓嶈冻");
}
-
Thread.sleep(500L);
// 璁㈠崟棰勬牎楠� ===>> 1.璁㈠崟鐘舵�侊紱 2.璁㈠崟甯﹀嚭鏁伴噺
- List<OrderDto> orderDtos = new ArrayList<>();
- for (LocDto locDto : locDtos) {
- if (!isJSON(locDto.getOrderNo())) {
- if (Cools.isEmpty(locDto.getOrderNo())) { continue; }
- OrderDto orderDto = new OrderDto(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), 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);
- }
- } else {
- // 璁㈠崟鍚堝苟鍑哄簱
- List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class);
- for (OrderDto one : orderDtoList) {
- OrderDto orderDto = new OrderDto(one.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), one.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());
- if (order.getSettle() > 2) {
- return R.error(orderDto.getOrderNo() + "璁㈠崟宸插け鏁堬紝璇峰強鏃跺埛鏂伴〉闈�");
- }
-// OrderDetl orderDetl = orderDetlService.selectItemNoneOfBatch(orderDto.getOrderNo(), orderDto.getMatnr());
-// if (orderDetl.getAnfme() - orderDetl.getQty() < orderDto.getAnfme()) {
-// return R.ok(orderDto.getOrderNo() + "璁㈠崟宸蹭綔涓氾紝璇峰強鏃跺埛鏂伴〉闈�");
-// }
- }
+ List<OrderDto> orderDtos = orderPreVerification(locDtos);
List<TaskDto> taskDtos = new ArrayList<>();
- // 鏍规嵁 锛堝簱浣� & 鍑哄簱绔欙級 鍒嗙粍锛� 鐞嗘兂鐘舵�侊細涓�缁勪负涓�娆″嚭搴撲换鍔�
- for (LocDto locDto : locDtos) {
- if (locDto.isLack()) { continue; }
- // 闃叉鍓嶇椤甸潰鎻愬彇搴撲綅淇℃伅鍚庯紝鍦ㄥ叾浠栧湴鏂瑰璇ュ簱浣嶇敓鎴愪簡鍑哄簱浠诲姟(搴撲綅鐘舵�侀潪F鐘舵��)
- LocMast locMast = locMastService.selectById(locDto.getLocNo());
- if(!Cools.isEmpty(locMast) && !locMast.getLocSts().equals("F")){
- return R.error("搴撲綅鍙烽潪鍦ㄥ簱鐘舵�侊紝璇烽噸鏂伴�夋嫨鍑哄簱搴撲綅===>>" + locDto.getLocNo());
- }
+ List<TaskDto> agvTaskDtos = new ArrayList<>();
+ generateTaskDto(locDtos, taskDtos, agvTaskDtos);
- 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);
- }
- }
+ //鐢熸垚AGV鍑哄簱浠诲姟
+ agvWorkService.processOut(agvTaskDtos, getUserId());
- // -----------------------------------------------------------------------------------------------
- List<String> excludeLocNos = taskDtos.stream().map(TaskDto::getLocNo).distinct().collect(Collectors.toList());
- for (TaskDto taskDto : taskDtos) {
- BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
- workService.stockOut(staNo, taskDto, getUserId());
- locMastService.breakUp(taskDto.getLocNo(), excludeLocNos);
- }
- return R.ok();*/
+ return R.ok();
}
@@ -236,7 +362,7 @@
*/
@RequestMapping(value = "/order/merge/preview/auth")
@ManagerAuth
- public R mergePreview(@RequestParam(value = "orderIds[]") List<Long> orderIds){
+ public R mergePreview(@RequestParam(value = "orderIds[]") List<Long> orderIds) {
return R.ok().add(orderService.mergePreview(orderIds));
}
@@ -253,9 +379,9 @@
continue;
}
//鍏堟壘AGV鐨勫簱瀛橈紝濡傛灉杩斿洖鐨刬ssued澶т簬0锛屽垯鍘诲洓椤瑰簱鎵�
- issued = agvLocDetlService.queryStockAndSetLocDto(vo.getMatnr(),vo.getBatch(),JSON.toJSONString(vo.getOrderDtos()),locDtoList,issued, vo.getCsocode(), vo.getIsoseq());
+ issued = agvLocDetlService.queryStockAndSetLocDto(vo.getMatnr(), vo.getBatch(), JSON.toJSONString(vo.getOrderDtos()), locDtoList, issued, vo.getCsocode(), vo.getIsoseq(), null);
//浠庡洓椤瑰簱鐨勫簱瀛橀噷闈㈡壘锛�
- issued = locDetlService.queryStockAndSetLocDto(vo.getMatnr(),vo.getBatch(),JSON.toJSONString(vo.getOrderDtos()),locDtoList,issued, vo.getCsocode(), vo.getIsoseq());
+ issued = locDetlService.queryStockAndSetLocDto(vo.getMatnr(), vo.getBatch(), JSON.toJSONString(vo.getOrderDtos()), locDtoList, issued, vo.getCsocode(), vo.getIsoseq());
if (issued > 0) {
LocDto locDto = new LocDto(null, vo.getMatnr(), vo.getMaktx(), vo.getBatch(), JSON.toJSONString(vo.getOrderDtos()), issued);
@@ -267,65 +393,29 @@
return R.ok().add(locDtoList);
- /*
- if (Cools.isEmpty(list)) {
- return R.parse(BaseRes.PARAM);
- }
- Set<String> exist = new HashSet<>();
- List<LocDto> locDtos = new ArrayList<>();
-
- for (OrderMergeVo vo : list) {
- double issued = Optional.of(vo.getAnfme()).orElse(0.0D);
- if (issued <= 0.0D) { continue; }
- List<LocDetl> locDetls = locDetlService.queryStock(vo.getMatnr(), vo.getBatch(), null, exist);
- for (LocDetl locDetl : locDetls) {
- if (issued > 0) {
- LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), JSON.toJSONString(vo.getOrderDtos()),
- issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
- int ioType = (issued >= locDetl.getAnfme() && locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("loc_no", locDto.getLocNo())) == 1) ? 101 : 103;
- List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ioType);
- locDto.setStaNos(staNos);
- locDtos.add(locDto);
- exist.add(locDetl.getLocNo());
- // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
- issued = issued - locDetl.getAnfme();
- } else {
- break;
- }
- }
- if (issued > 0) {
- LocDto locDto = new LocDto(null, vo.getMatnr(), vo.getMaktx(), vo.getBatch(), JSON.toJSONString(vo.getOrderDtos()), issued);
- locDto.setLack(Boolean.TRUE);
- locDtos.add(locDto);
- }
- }
- for (LocDto locDto : locDtos) {
- Mat mat = matService.selectByMatnr(locDto.getMatnr());
- assert mat != null;
- locDto.setSpecs(mat.getSpecs());
- }
- return R.ok().add(locDtos);*/
}
/*
鐢熸垚鍑哄簱浠诲姟dto
*/
- private void generateTaskDto(List<LocDto> locDtos, List<TaskDto> taskDtos, List<TaskDto> agvTaskDtos){
+ private void generateTaskDto(List<LocDto> locDtos, List<TaskDto> taskDtos, List<TaskDto> agvTaskDtos) {
// 鏍规嵁 锛堝簱浣� & 鍑哄簱绔欙級 鍒嗙粍锛� 鐞嗘兂鐘舵�侊細涓�缁勪负涓�娆″嚭搴撲换鍔�
for (LocDto locDto : locDtos) {
- if (locDto.isLack()) { continue; }
+ if (locDto.isLack()) {
+ continue;
+ }
//AGV搴�
- if(!Cools.isEmpty(locDto.getAgvStaNos())){
+ if (!Cools.isEmpty(locDto.getAgvStaNos())) {
//骞冲簱
- if("鏃犻渶绔欑偣".equals(locDto.getAgvStaNo())){
+ if ("鏃犻渶绔欑偣".equals(locDto.getAgvStaNo())) {
generateManPakout(locDto);
+ } else {
+ generateTaskDtoForAgv(locDto, agvTaskDtos);
}
- generateTaskDtoForAgv(locDto,agvTaskDtos);
-
//鍥涢」搴�
- }else{
- generateTaskDtoForBase(locDto,taskDtos);
+ } else {
+ generateTaskDtoForBase(locDto, taskDtos);
}
}
@@ -334,34 +424,31 @@
/*
鐢熸垚AGV鐨勪换鍔to
*/
- private void generateTaskDtoForAgv(LocDto locDto, List<TaskDto> agvTaskDtos){
+ private void generateTaskDtoForAgv(LocDto locDto, List<TaskDto> agvTaskDtos) {
// 闃叉鍓嶇椤甸潰鎻愬彇搴撲綅淇℃伅鍚庯紝鍦ㄥ叾浠栧湴鏂瑰璇ュ簱浣嶇敓鎴愪簡鍑哄簱浠诲姟(搴撲綅鐘舵�侀潪F鐘舵��)
AgvLocMast agvLocMast = agvLocMastService.selectById(locDto.getLocNo());
- if(!Cools.isEmpty(agvLocMast) && !agvLocMast.getLocSts().equals("F")){
+ if (!Cools.isEmpty(agvLocMast) && !agvLocMast.getLocSts().equals("F")) {
throw new CoolException("搴撲綅鍙烽潪鍦ㄥ簱鐘舵�侊紝璇烽噸鏂伴�夋嫨鍑哄簱搴撲綅===>>" + locDto.getLocNo());
}
- AgvBasDevp agvBasDevp = agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>()
- .eq("station_code", locDto.getAgvStaNo())
- .eq("loc_sts", "O"));
- if(Cools.isEmpty(agvBasDevp)){
- //TODO 鍋囧鍑哄簱绔欑偣涓嶈冻锛岃褰曟湭鍑哄簱鐨勫簱浣嶏紱
+ TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getAgvStaNo(), locDto);
+ if (TaskDto.has(agvTaskDtos, taskDto)) {
+ TaskDto dto = TaskDto.find(agvTaskDtos, taskDto);
+ assert dto != null;
+ dto.getLocDtos().addAll(taskDto.getLocDtos());
return;
+ } else {
+ agvTaskDtos.add(taskDto);
}
- agvBasDevp.setLocSts("S");
- agvBasDevpService.updateById(agvBasDevp);
- TaskDto taskDto = new TaskDto(locDto.getLocNo(), agvBasDevp.getDevNo(), locDto);
- //TODO 鏆備笉鑰冭檻搴撲綅娣疯浇鐘舵�侊紙鍚庣画鐪嬫儏鍐垫槸鍚﹂渶瑕佸垽鏂級
- agvTaskDtos.add(taskDto);
}
/*
鐢熸垚鍥涢」搴撶殑浠诲姟dto
*/
- private void generateTaskDtoForBase(LocDto locDto, List<TaskDto> taskDtos){
+ private void generateTaskDtoForBase(LocDto locDto, List<TaskDto> taskDtos) {
// 闃叉鍓嶇椤甸潰鎻愬彇搴撲綅淇℃伅鍚庯紝鍦ㄥ叾浠栧湴鏂瑰璇ュ簱浣嶇敓鎴愪簡鍑哄簱浠诲姟(搴撲綅鐘舵�侀潪F鐘舵��)
LocMast locMast = locMastService.selectById(locDto.getLocNo());
- if(!Cools.isEmpty(locMast) && !locMast.getLocSts().equals("F")){
+ if (!Cools.isEmpty(locMast) && !locMast.getLocSts().equals("F")) {
throw new CoolException("搴撲綅鍙烽潪鍦ㄥ簱鐘舵�侊紝璇烽噸鏂伴�夋嫨鍑哄簱搴撲綅===>>" + locDto.getLocNo());
}
@@ -379,39 +466,40 @@
/*
鐢熸垚骞冲簱鎷ｈ揣鍗�
*/
- private void generateManPakout(LocDto locDto){
- ManLocDetl manLocDetl = manLocDetlService.selectItem(locDto.getLocNo(), locDto.getMatnr(), locDto.getBatch());
- if (!Cools.isEmpty(manLocDetl) && !(locDto.getAnfme()>manLocDetl.getAnfme())) {
+ private void generateManPakout(LocDto locDto) {
+ ManLocDetl manLocDetl = manLocDetlService.selectItem(locDto.getLocNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq(), locDto.getContainerCode());
+ if (!Cools.isEmpty(manLocDetl) && !(locDto.getAnfme() > manLocDetl.getAnfme())) {
manLocDetl.setStatus(0);
- manLocDetlService.update(manLocDetl, new EntityWrapper<ManLocDetl>().eq("loc_no", manLocDetl.getLocNo()).eq("matnr",manLocDetl.getMatnr()));
+ manLocDetlService.update(manLocDetl, new EntityWrapper<ManLocDetl>().eq("loc_no", manLocDetl.getLocNo()).eq("matnr", manLocDetl.getMatnr()));
+ //addPakOUT 鐢熸垚鎷ｈ揣鍗曟垚鍔�
if (addPakOUT(locDto).equals(R.ok())) {
Order order = orderService.selectByNo(locDto.getOrderNo());
- if (Cools.isEmpty(order)){
- throw new CoolException("鏌ヨ璁㈠崟澶辫触锛岃鑱旂郴绠＄悊鍛�"+locDto.getOrderNo());
+ if (Cools.isEmpty(order)) {
+ throw new CoolException("鏌ヨ璁㈠崟澶辫触锛岃鑱旂郴绠＄悊鍛�" + locDto.getOrderNo());
}
- if (order.getSettle()==1){
- if (!orderService.updateSettle(order.getId(),2L,null)){
- throw new CoolException("淇敼璁㈠崟鐘舵�佸け璐ワ紝璇疯仈绯荤鐞嗗憳"+locDto.getOrderNo());
+ if (order.getSettle() == 1) {
+ if (!orderService.updateSettle(order.getId(), 2L, null)) {
+ throw new CoolException("淇敼璁㈠崟鐘舵�佸け璐ワ紝璇疯仈绯荤鐞嗗憳" + locDto.getOrderNo());
}
}
OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", locDto.getOrderNo()).eq("matnr", locDto.getMatnr()));
- if (Cools.isEmpty(orderDetl)){
- throw new CoolException("鏌ヨ璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�"+locDto.getOrderNo()+locDto.getMatnr());
+ if (Cools.isEmpty(orderDetl)) {
+ throw new CoolException("鏌ヨ璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�" + locDto.getOrderNo() + locDto.getMatnr());
}
orderDetl.setQty(orderDetl.getQty() + locDto.getAnfme());
- if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no", locDto.getOrderNo()).eq("matnr", locDto.getMatnr()))){
- throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�"+locDto.getOrderNo()+locDto.getMatnr());
+ if (!orderDetlService.update(orderDetl, new EntityWrapper<OrderDetl>().eq("order_no", locDto.getOrderNo()).eq("matnr", locDto.getMatnr()))) {
+ throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�" + locDto.getOrderNo() + locDto.getMatnr());
}
}
- }else {
+ } else {
throw new CoolException("搴撳瓨涓嶈冻");
}
}
- private R addPakOUT(LocDto locDto){
- ManPakOut manPakOut=new ManPakOut();
- manPakOut.setWrkNo(locDto.getOrderNo()+"-"+System.currentTimeMillis());
- manPakOut.setWrkSts((long)1);
+ private R addPakOUT(LocDto locDto) {
+ ManPakOut manPakOut = new ManPakOut();
+ manPakOut.setWrkNo(locDto.getOrderNo() + "-" + System.currentTimeMillis());
+ manPakOut.setWrkSts((long) 1);
manPakOut.setAnfme(locDto.getAnfme());
manPakOut.setLocNo(locDto.getLocNo());
manPakOut.setMatnr(locDto.getMatnr());
@@ -429,18 +517,19 @@
manPakOut.setIsoseq(locDto.getIsoseq());
ManPakOut manPakOutExist = manPakOutService.selectOne(new EntityWrapper<ManPakOut>().eq("doc_num", locDto.getOrderNo()));
- if (Cools.isEmpty(manPakOutExist)){
+ if (Cools.isEmpty(manPakOutExist)) {
manPakOut.setName(locDto.getMaktx());
- }else{
+ } else {
manPakOut.setUuid(manPakOutExist.getUuid());
}
- try{
- if (!manPakOutService.insert(manPakOut)){
- return R.error("娣诲姞鎷ｈ揣鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- }catch (Exception e){
- return R.error("娣诲姞鎷ｈ揣鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
+ manPakOutService.insert(manPakOut);
+// try{
+// if (!manPakOutService.insert(manPakOut)){
+// return R.error("娣诲姞鎷ｈ揣鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
+// }
+// }catch (Exception e){
+// return R.error("娣诲姞鎷ｈ揣鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
+// }
return R.ok();
}
@@ -448,12 +537,14 @@
/*
璁㈠崟棰勬牎楠� ===>> 1.璁㈠崟鐘舵�侊紱 2.璁㈠崟甯﹀嚭鏁伴噺
*/
- private List<OrderDto> orderPreVerification(List<LocDto> locDtos){
+ private List<OrderDto> orderPreVerification(List<LocDto> locDtos) {
List<OrderDto> orderDtos = new ArrayList<>();
for (LocDto locDto : locDtos) {
if (!isJSON(locDto.getOrderNo())) {
- //if (!Cools.isEmpty(locDto.getOrderNo())) {
- if (Cools.isEmpty(locDto.getOrderNo())) { continue; }
+ //if (!Cools.isEmpty(locDto.getOrderNo())) {
+ if (Cools.isEmpty(locDto.getOrderNo())) {
+ continue;
+ }
OrderDto orderDto = new OrderDto(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getAnfme());
if (OrderDto.has(orderDtos, orderDto)) {
OrderDto dto = OrderDto.find(orderDtos, orderDto);
--
Gitblit v1.9.1