From b9d1914c7d4393b845458bfd428e81265238c7b9 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期三, 21 八月 2024 13:29:15 +0800
Subject: [PATCH] 调整显示字段
---
src/main/java/com/zy/third/erp/task/ERPOutCancelScheduler.java | 2 +-
src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java | 2 +-
src/main/webapp/static/js/order/out.js | 2 +-
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 2 +-
src/main/java/com/zy/asrs/controller/OutController.java | 50 ++++++++++++++++++++++++++++++++++++--------------
5 files changed, 40 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index cf01421..1b7cb3d 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -1,5 +1,6 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -78,7 +79,9 @@
}
List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
List<LocDto> locDtos = new ArrayList<>();
-
+ orderDetls = orderDetls.stream()
+ .sorted(Comparator.comparing(OrderDetl::getMatnr).thenComparing(OrderDetl::getBatch))
+ .collect(Collectors.toList());
Set<String> exist = new HashSet<>();
for (OrderDetl orderDetl : orderDetls) {
@@ -92,20 +95,39 @@
} else {
locDetls = locDetlService.queryStock(orderDetl.getSPgNO());
}
+
for (LocDetl locDetl : locDetls) {
- if (locDetl.getMatnr().equals(orderDetl.getMatnr())) {
- 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);
- locDto.setModel(locDetl.getModel());
- locDtos.add(locDto);
- exist.add(locDetl.getLocNo());
- // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
- issued = issued - locDetl.getAnfme();
- } else {
- break;
+ if (Cools.isEmpty(locDetl.getBatch())||Cools.isEmpty(orderDetl.getBatch())){
+ if (locDetl.getMatnr().equals(orderDetl.getMatnr())) {
+ 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);
+ locDto.setModel(locDetl.getModel());
+ locDtos.add(locDto);
+ exist.add(locDetl.getLocNo());
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ issued = issued - locDetl.getAnfme();
+ } else {
+ break;
+ }
+ }
+ }else {
+ if (locDetl.getMatnr().equals(orderDetl.getMatnr())&&locDetl.getBatch().equals(orderDetl.getBatch())) {
+ 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);
+ locDto.setModel(locDetl.getModel());
+ locDtos.add(locDto);
+ exist.add(locDetl.getLocNo());
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ issued = issued - locDetl.getAnfme();
+ } else {
+ break;
+ }
}
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index e5981bd..187e2b8 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -298,7 +298,7 @@
int ioType = taskDto.isAll() ? 101 : 103;
StaDesc staDesc = staDescService.queryCrnStnAuto(ioType, locMast.getCrnNo(), staNo.getDevNo());
// 鐢熸垚宸ヤ綔鍙�
- int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
+ int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
diff --git a/src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java b/src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java
index 987aae1..6f33115 100644
--- a/src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java
@@ -27,7 +27,7 @@
@Transactional(rollbackFor = Throwable.class)
- @Scheduled(cron = "${erp.refreshtime}")
+ //@Scheduled(cron = "${erp.refreshtime}")
public void InCancelScheduler() {
if (!erpEnabled) return;
String sqlInCancelTB = "select * from erp_InCancelTB where LKName='涓壃浜屾湡'";
diff --git a/src/main/java/com/zy/third/erp/task/ERPOutCancelScheduler.java b/src/main/java/com/zy/third/erp/task/ERPOutCancelScheduler.java
index 7a01aa3..29e4e5a 100644
--- a/src/main/java/com/zy/third/erp/task/ERPOutCancelScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPOutCancelScheduler.java
@@ -28,7 +28,7 @@
@Transactional(rollbackFor = Throwable.class)
- @Scheduled(cron = "${erp.refreshtime}")
+ //@Scheduled(cron = "${erp.refreshtime}")
public void InCancelScheduler() {
//log.info("InCancelScheduler寮�濮嬩簡");
if (!erpEnabled) return;
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index a76fdb8..c83dd62 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -141,7 +141,7 @@
,title: false
,closeBtn: false
,offset: '50px'
- ,area: ['1200px', '700px']
+ ,area: ['80%', '80%']
,shade: 0.5
,shadeClose: false
,btn: ['绔嬪嵆鍑哄簱', '绋嶅悗澶勭悊']
--
Gitblit v1.9.1