From 5829b04e534b0779b1e67993bc3246adcecaf164 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 13 十一月 2025 16:22:47 +0800
Subject: [PATCH] *
---
src/main/webapp/static/js/locDetl/locDetl.js | 65 ++++++++++----------------------
src/main/java/com/zy/asrs/task/handler/GroupOrderFormHandler.java | 16 ++++----
src/main/java/com/zy/asrs/controller/LocDetlController.java | 7 ++-
3 files changed, 32 insertions(+), 56 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index e25eb46..49ad3aa 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -330,10 +330,11 @@
return R.error("鐢ㄦ埛寮傚父").add("鐢ㄦ埛寮傚父");
}
List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("model", model));
- OrderInspectionRollParam orderInspectionRollParam = new OrderInspectionRollParam(model);
+// OrderInspectionRollParam orderInspectionRollParam = new OrderInspectionRollParam(model);
String response = "";
boolean success = false;
- Map<String, Object> params = JSON.parseObject(JSON.toJSONString(orderInspectionRollParam), Map.class);
+ Map<String, Object> params = new HashMap<>();
+ params.put("batchNo", model);
try {
response = new HttpHandler.Builder()
.setUri(qualityFinishedCheckoutUrl)
@@ -375,7 +376,7 @@
qualityFinishedCheckoutUrl+"/"+qualityFinishedCheckout,
null,
"127.0.0.1",
- JSON.toJSONString(orderInspectionRollParam),
+ JSON.toJSONString(params),
response,
success
);
diff --git a/src/main/java/com/zy/asrs/task/handler/GroupOrderFormHandler.java b/src/main/java/com/zy/asrs/task/handler/GroupOrderFormHandler.java
index 17f9386..4dcca90 100644
--- a/src/main/java/com/zy/asrs/task/handler/GroupOrderFormHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/GroupOrderFormHandler.java
@@ -25,10 +25,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* Created by Monkey D. Luffy on 2025.11.10
@@ -145,10 +142,13 @@
}
}
- OrderInspectionRollParam orderInspectionRollParam = new OrderInspectionRollParam(orderDetl.getModel());
+// OrderInspectionRollParam orderInspectionRollParam = new OrderInspectionRollParam(orderDetl.getModel());
String response = "";
boolean success = false;
- Map<String, Object> params = JSON.parseObject(JSON.toJSONString(orderInspectionRollParam), Map.class);
+// Map<String, Object> params = JSON.parseObject(JSON.toJSONString(orderInspectionRollParam), Map.class);
+
+ Map<String, Object> params = new HashMap<>();
+ params.put("batchNo", orderDetl.getModel());
try {
response = new HttpHandler.Builder()
.setUri(qualityFinishedCheckoutUrl)
@@ -189,7 +189,7 @@
}else {
memo = memo+";鍗峰彿"+ orderDetl.getModel()+"鏌ヨ缁撴灉锛�"+jsonObject.getString("message");
}
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", qualityFinishedCheckoutUrl+"/"+qualityFinishedCheckout, JSON.toJSONString(orderInspectionRollParam), response);
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", qualityFinishedCheckoutUrl+"/"+qualityFinishedCheckout, JSON.toJSONString(params), response);
// throw new CoolException("鏌ヨ鍗峰彿鏄惁鍚堟牸澶辫触");
}
} catch (Exception e) {
@@ -209,7 +209,7 @@
qualityFinishedCheckoutUrl+"/"+qualityFinishedCheckout,
null,
"127.0.0.1",
- JSON.toJSONString(orderInspectionRollParam),
+ JSON.toJSONString(params),
response,
success
);
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 18b853c..3697125 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -42,7 +42,7 @@
// cols.push.apply(cols, detlCols);
cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',hide: true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:100}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:160}
)
return cols;
@@ -261,22 +261,15 @@
}
});
break;
- case 'edit':
+ case 'inspection':
var model = top.reObject(data).model;
if (model === undefined) {
layer.msg("鏃犳暟鎹�");
}
- this.$confirm(
- '纭鍚慚ES鏍″噯鏄惁鍚堟牸锛�',
- '纭淇敼',
- {
- confirmButtonText: '纭',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
- dangerouslyUseHTMLString: true
- }
- ).then(() => {
- // 璋冪敤鍚庡彴API涓婃姤鏁版嵁
+ layer.confirm('纭鍚慚ES鏍″噯鏄惁鍚堟牸', {
+ shade: .1,
+ skin: 'layui-layer-admin'
+ }, function (i) {
$.ajax({
url: baseUrl + "/actual/shipment/locDetl/report/auth",
headers: {'token': localStorage.getItem('token')},
@@ -284,40 +277,22 @@
model: model // 浼犻�掔粍璐у崟鍙�
},
method: 'POST',
- success: (res) => {
- this.reportLoading = false;
- if (typeof done === 'function') {
- done();
+ success: function (res) {
+ layer.closeAll('loading');
+ if (res.code === 200){
+ if (insTbCount === 0) {
+ insTb.reload({page: {curr: 1}});
+ } else {
+ $(".layui-laypage-btn")[0].click();
+ }
+ layer.msg(res.msg, {icon: 1});
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
}
- if (res.code === 200 || res.success) {
- this.$message({
- message: `缁勮揣鍗曞彿 ${groupOrderNo} 涓婃姤鎴愬姛`,
- type: 'success',
- duration: 3000
- });
- // 涓婃姤鎴愬姛鍚庡叧闂脊绐楀苟鍒锋柊鏁版嵁
- setTimeout(() => {
- this.closeDetailDialog();
- this.getTableDataA(); // 鍒锋柊涓昏〃鏁版嵁
- }, 1500);
- } else {
- this.$message.error(res.message || '涓婃姤澶辫触');
- }
- },
- error: (error) => {
- this.reportLoading = false;
- if (typeof done === 'function') {
- done();
- }
- console.error('涓婃姤澶辫触:', error);
- this.$message.error('涓婃姤澶辫触锛岃妫�鏌ョ綉缁滆繛鎺�');
}
- });
- }).catch(() => {
- this.$message({
- type: 'info',
- message: '宸插彇娑堜慨鏀�'
- });
+ })
});
break;
case 'locNo':
--
Gitblit v1.9.1