From c039b42920df96629bc570883cd498e58276e643 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 05 一月 2026 14:59:43 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/locDetlStatis/locDetlStatis.js | 6 +++---
src/main/webapp/static/js/basArmMastExp/basArmMastExp.js | 12 ++++++------
src/main/java/com/zy/common/utils/HttpHandler.java | 2 +-
src/main/java/com/zy/asrs/controller/BasArmMastController.java | 24 ++++++++++++++++++++++++
src/main/webapp/static/js/common.js | 4 ++--
src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java | 3 ++-
6 files changed, 38 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasArmMastController.java b/src/main/java/com/zy/asrs/controller/BasArmMastController.java
index 53c2dcf..ac73fc1 100644
--- a/src/main/java/com/zy/asrs/controller/BasArmMastController.java
+++ b/src/main/java/com/zy/asrs/controller/BasArmMastController.java
@@ -46,6 +46,30 @@
wrapper.orderBy("create_time",false);
return R.ok(basArmMastService.selectPage(new Page<>(curr, limit), wrapper));
}
+ @RequestMapping(value = "/basArmMast/listArm/auth")
+ @ManagerAuth
+ public R listArm(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
+ EntityWrapper<BasArmMast> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(BasArmMast.class, param.keySet(), wrapper, condition);
+
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
+ wrapper.orderBy("create_time", false);
+
+ // 濡傛灉涓嶉渶瑕佸垎椤碉紝浣跨敤 selectList() 鑾峰彇鎵�鏈夋暟鎹�
+ List<BasArmMast> allData = basArmMastService.selectList(wrapper);
+
+ return R.ok(allData); // 鐩存帴杩斿洖鎵�鏈夋暟鎹�
+ }
+
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
index a55c243..713a851 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
@@ -166,10 +166,11 @@
path = imPurreceiveBillAddress;
break;
case "OUI_RECEIVEBIll"://濮斿鍏ュ簱鍗�
- jsonObject.put("billstatus", Arrays.asList("A"));//鏁版嵁鐘舵�� [A:鏆傚瓨, B:宸叉彁浜�, C:宸插鏍竇
+ jsonObject.put("billstatus", Arrays.asList("C"));//鏁版嵁鐘舵�� [A:鏆傚瓨, B:宸叉彁浜�, C:宸插鏍竇
jsonObject.put("auditdate_start", latestUpdateTime);
jsonObject.put("auditdate_end", sdf1.format(now));
path = omOutsourcereceiptQuery;
+ break;
case "SAL_OUTSTOCK"://閿�鍞嚭搴撳崟鏌ヨ
path = imSaloutbill;
jsonObject.put("modify_starttime", latestUpdateTime);//涓氬姟璧峰鏃ユ湡
diff --git a/src/main/java/com/zy/common/utils/HttpHandler.java b/src/main/java/com/zy/common/utils/HttpHandler.java
index 70adcc7..9e38852 100644
--- a/src/main/java/com/zy/common/utils/HttpHandler.java
+++ b/src/main/java/com/zy/common/utils/HttpHandler.java
@@ -15,7 +15,7 @@
*/
public class HttpHandler {
- private static final Integer DEFAULT_TIMEOUT_SECONDS = 5;
+ private static final Integer DEFAULT_TIMEOUT_SECONDS = 10;
private static final MediaType MEDIA_TYPE = MediaType.parse("application/json;charset=utf-8");
private String uri;
diff --git a/src/main/webapp/static/js/basArmMastExp/basArmMastExp.js b/src/main/webapp/static/js/basArmMastExp/basArmMastExp.js
index 6c4cab8..06757c2 100644
--- a/src/main/webapp/static/js/basArmMastExp/basArmMastExp.js
+++ b/src/main/webapp/static/js/basArmMastExp/basArmMastExp.js
@@ -12,7 +12,7 @@
tableIns = table.render({
elem: '#basArmMastExp',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/basArmMast/list/auth',
+ url: baseUrl+'/basArmMast/listArm/auth',
page: true,
limit: 15,
limits: [15, 30, 50, 100, 200, 500],
@@ -26,7 +26,7 @@
{field: 'matnr', align: 'center', title: '鍟嗗搧缂栧彿'},
{field: 'po', align: 'center', title: 'PO'},
{field: 'upc', align: 'center', title: 'UPC'},
- {field: 'sortingLine', align: 'center', title: '璧风偣'},
+ {field: 'staNo', align: 'center', title: '璧风偣'},
{field: 'status', align: 'center', title: '浣滀笟鐘舵��', templet: function(d){
return '2.鍗曠爜瀹屾垚绛夊緟鎵樼洏瀹屾垚'; // 鍥犱负鐜板湪鍙樉绀虹姸鎬�2锛屽浐瀹氭樉绀�
}},
@@ -49,16 +49,16 @@
};
}
- var records = res.data.records || [];
+ var records = res.data || [];
var groupMap = new Map(); // 鐢ㄦ潵姹囨�荤姸鎬佷负2鐨勬暟鎹�
-
records.forEach(function(item) {
// 鍙鐞嗙姸鎬佷负2鐨勮褰曪紝鍏朵粬鐘舵�佺洿鎺ュ拷鐣ワ紙闅愯棌锛�
+
if (String(item.status) === '2') {
// 鐢熸垚鍞竴鏍囪瘑锛�5涓瓧娈电粍鍚堬級
var key = [
item.armNo || '',
- item.sortingLine || '',
+ item.staNo || '',
item.barcode || '',
item.matnr || '',
item.orderNo || ''
@@ -75,7 +75,7 @@
matnr: item.matnr,
po: item.po || '',
upc: item.upc || '',
- sortingLine: item.sortingLine,
+ staNo: item.staNo,
barcode: item.barcode,
supplier: item.supplier || '',
status: '2', // 鍥哄畾鏄剧ず涓�2
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index d8fd1dc..f94bd5e 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -241,13 +241,13 @@
// ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
// ,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
,{field: 'standby2', align: 'center',title: '鏉＄爜upc', hide: false}
- ,{field: 'units', align: 'center',title: '鍗曠姣涢噸kg', hide: true}
+ ,{field: 'units', align: 'center',title: '鍗曠姣涢噸kg', hide: false}
// ,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
// ,{field: 'origin', align: 'center',title: '鍦ㄥ簱鏍囪', hide: true}
,{field: 'manu', align: 'center',title: '浠撳簱缂栫爜', hide: true}
// ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
// ,{field: 'safeQty', align: 'center',title: '鎬讳欢鏁�', hide: true}
- ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲峩g', hide: false}
+ ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲峩g', hide: true}
// ,{field: 'manLength', align: 'center',title: '闀匡紙姣背锛�', hide: false}
// ,{field: 'width', align: 'center',title: '瀹斤紙姣背锛�', hide: false}
// ,{field: 'height', align: 'center',title: '楂橈紙姣背锛�', hide: false}
diff --git a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
index a1adf70..5d4a8dd 100644
--- a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
+++ b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
@@ -126,8 +126,8 @@
success: function (res) {
layer.closeAll();
if (res.code === 200 && res.data && res.data.length > 0) {
- var titles = ['搴撳瓨鏁伴噺', '鍟嗗搧缂栧彿', '鍟嗗搧鍚嶇О', '閲囪喘鍗曞彿', '鏉＄爜UPC', '鍗曠鍑�閲�(kg)', '瀹㈡埛PO'];
- var fieldKeys = ['anfme', 'matnr', 'maktx', 'boxType3', 'standby2', 'weight', 'standby1'];
+ var titles = ['搴撳瓨鏁伴噺', '鍟嗗搧缂栧彿', '鍟嗗搧鍚嶇О', '閲囪喘鍗曞彿', '鏉＄爜UPC', '鍗曠姣涢噸(kg)', '瀹㈡埛PO'];
+ var fieldKeys = ['anfme', 'matnr', 'maktx', 'boxType3', 'standby2', 'units', 'standby1'];
var exportData = res.data.map(function(item) {
return [
@@ -136,7 +136,7 @@
item.maktx || '', // 濡傛灉 maktx 涓虹┖鍙粯璁�
item.boxType3 || '',
item.standby2 || '',
- item.weight || '',
+ item.units || '',
item.standby1 || '' // 濡傚瓧娈垫槸 order_no 鏀规垚 item.order_no
];
});
--
Gitblit v1.9.1