From 0e6a308dcd198a0c4aeeb8162bd1a4d1a787b016 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期三, 07 五月 2025 09:41:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/config/CoolExceptionHandler.java | 1
src/main/webapp/static/js/order/out.js | 2
src/main/java/com/zy/common/model/TaskDto.java | 3 +
src/main/webapp/views/order/out.html | 2
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 31 ++++++++++++---
src/main/java/com/zy/asrs/entity/OrderDetlLog.java | 22 -----------
6 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlLog.java b/src/main/java/com/zy/asrs/entity/OrderDetlLog.java
index f675640..8aa266a 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlLog.java
@@ -286,12 +286,6 @@
private String memo;
- /**
- * 宸ュ簭鐘舵��
- */
- @ApiModelProperty(value= "宸ュ簭鐘舵�� 1锛氬緟鍔犲伐锛�2锛氬凡鍔犲伐锛�3锛氭棤闇�鍔犲伐")
- @TableField("process_sts")
- private Integer processSts;
public OrderDetlLog() {}
@@ -335,7 +329,6 @@
this.updateBy = updateBy;
this.updateTime = updateTime;
this.memo = memo;
- this.processSts = processSts;
}
public String getOrderId$(){
@@ -347,21 +340,6 @@
return null;
}
- public String getProcessSts$(){
- if (null == this.processSts){ return null; }
- switch (this.processSts){
- case 0:
- return "鍏朵粬";
- case 1:
- return "寰呭姞宸�";
- case 2:
- return "宸插姞宸�";
- case 3:
- return "鏃犻渶鍔犲伐";
- default:
- return String.valueOf(this.processSts);
- }
- }
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
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 5e1263d..1860cc7 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -23,10 +23,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
/**
* 绉诲姩绔湇鍔℃牳蹇冪被
@@ -115,7 +112,14 @@
combMat.setBatch("");
}
}
-
+ HashMap<String,Object> cM=new HashMap<>();
+ for (CombParam.CombMat combMat : param.getCombMats()) {
+ if (cM.get(combMat.getMatnr()+combMat.getBatch())==null){
+ cM.put(combMat.getMatnr()+combMat.getBatch(),combMat);
+ }else {
+ throw new CoolException("缁勬墭鏁版嵁涓瓨鍦ㄩ噸澶嶇殑鏁版嵁===>>缂栫爜锛�" + combMat.getMatnr()+"鎵瑰彿锛�"+combMat.getBatch());
+ }
+ }
@@ -259,7 +263,14 @@
combMat.setBatch("");
}
}
-
+ HashMap<String,Object> cM=new HashMap<>();
+ for (CombParam.CombMat combMat : param.getCombMats()) {
+ if (cM.get(combMat.getMatnr()+combMat.getBatch())==null){
+ cM.put(combMat.getMatnr()+combMat.getBatch(),combMat);
+ }else {
+ throw new CoolException("缁勬墭鏁版嵁涓瓨鍦ㄩ噸澶嶇殑鏁版嵁===>>缂栫爜锛�" + combMat.getMatnr()+"鎵瑰彿锛�"+combMat.getBatch());
+ }
+ }
@@ -424,6 +435,14 @@
combMat.setBatch("");
}
}
+ HashMap<String,Object> cM=new HashMap<>();
+ for (CombParam.CombMat combMat : param.getCombMats()) {
+ if (cM.get(combMat.getMatnr()+combMat.getBatch())==null){
+ cM.put(combMat.getMatnr()+combMat.getBatch(),combMat);
+ }else {
+ throw new CoolException("缁勬墭鏁版嵁涓瓨鍦ㄩ噸澶嶇殑鏁版嵁===>>缂栫爜锛�" + combMat.getMatnr()+"鎵瑰彿锛�"+combMat.getBatch());
+ }
+ }
diff --git a/src/main/java/com/zy/common/config/CoolExceptionHandler.java b/src/main/java/com/zy/common/config/CoolExceptionHandler.java
index b3968a3..1e2b6e2 100644
--- a/src/main/java/com/zy/common/config/CoolExceptionHandler.java
+++ b/src/main/java/com/zy/common/config/CoolExceptionHandler.java
@@ -26,6 +26,7 @@
@ExceptionHandler(CoolException.class)
public R handleRRException(CoolException e) {
+ e.printStackTrace();
String[] split = e.getMessage().split("-");
if (split.length == 2) {
if (String.valueOf(split[0]).length() < 3) {
diff --git a/src/main/java/com/zy/common/model/TaskDto.java b/src/main/java/com/zy/common/model/TaskDto.java
index 4ba8064..3ba34cd 100644
--- a/src/main/java/com/zy/common/model/TaskDto.java
+++ b/src/main/java/com/zy/common/model/TaskDto.java
@@ -1,5 +1,6 @@
package com.zy.common.model;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
@@ -107,6 +108,8 @@
}
}
if (dto.getAnfme() > locDetl.getAnfme()) {
+ System.out.println(JSON.toJSON(dto));
+ System.out.println(JSON.toJSON(locDetl));
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
}
if (dto.getAnfme().equals(locDetl.getAnfme())) {
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 515b971..556df67 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -25,7 +25,7 @@
url: baseUrl+'/orderDetl/pakout/list/auth',
page: true,
limit: 15,
- limits: [15, 30, 50, 100, 200, 500],
+ limits: [15, 30, 50, 100, 200, 1000],
toolbar: '#orderDetToolbar',
height: 'full-120',
where: {order_id: 9999999999},
diff --git a/src/main/webapp/views/order/out.html b/src/main/webapp/views/order/out.html
index 7209318..cc128a9 100644
--- a/src/main/webapp/views/order/out.html
+++ b/src/main/webapp/views/order/out.html
@@ -303,7 +303,7 @@
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/tools/md5.js"></script>
<script type="text/javascript" src="../../static/js/orderTable.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/order/out.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/order/out.js?v=1" charset="utf-8"></script>
<!--<script type="text/template" id="takeSiteSelectTemplate">-->
<!-- {{#each data}}-->
<!-- <option value="{{siteId}}">{{desc}}</option>-->
--
Gitblit v1.9.1