From bd1744487c58d169a0c8ceca982d1c5ae07dbce6 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 06 十一月 2025 20:47:02 +0800
Subject: [PATCH] *
---
src/main/webapp/static/js/order/order.js | 16 +++++++++-------
src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java | 13 ++++++++-----
2 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
index 0e862cd..bf8ea92 100644
--- a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
@@ -4,10 +4,7 @@
import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.R;
-import com.core.common.SpringUtils;
+import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
@@ -194,7 +191,13 @@
// locDetl.getBatch(),locDetl.getBrand(),locDetl.getBarcode(), outLocBoxC[1],locDetl.getAnfme());
// locDto.setOrigin(locDetl.getOrigin());
// locDto.setWeight(locDetl.getWeight());
- locDetl.setMemo(outLocBoxC[3]);
+
+ if (!Cools.isEmpty(outLocBoxC[3])){
+ String memo = Cools.isEmpty(locDetl.getMemo())? "" : locDetl.getMemo()+"锛�";
+ locDetl.setMemo(memo + DateUtils.convert(new Date(), DateUtils.yyyyMMdd_C)+"鎵嬪姩杈撳叆澶囨敞锛�" + outLocBoxC[3]);
+ } else if (Cools.isEmpty(locDetl.getMemo())){
+ locDetl.setMemo(outLocBoxC[3]);
+ }
LocDto locDto = new LocDto(locDetl);
locDtos.add(locDto);
}
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index f2454ee..9a598e2 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -250,9 +250,10 @@
cols: [[
{type: 'numbers'},
{field: 'matnr', title: '瑙勬牸', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
- {field: 'batch', title: '绠卞彿'},
- {field: 'anfme', title: '鏁伴噺'},
+ // {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
+ {field: 'batch', align: 'center', title: '绠卞彿'},
+ {field: 'model', align: 'center',title: '鍗峰彿'},
+ // {field: 'anfme', align: 'center', title: '鏁伴噺'},
// {field: 'workQty', title: '浣滀笟鏁伴噺'},
// {field: 'unit', title: '鍗曚綅'},
@@ -263,10 +264,11 @@
// },
// {field: 'inQty', title: '宸插叆搴撻噺'},
// {field: 'color', title: '棰滆壊'},
- {field: 'specs', title: '鎺ュご'},
- {field: 'danger$', title: '寰呭垽'},
- {field: 'qty$', title: '鐘舵��', style: 'font-weight: bold'},
- {field: 'source$', title: '鏄惁纭', style: 'font-weight: bold'}
+ {field: 'specs', align: 'center', title: '鎺ュご'},
+ {field: 'danger$', align: 'center', title: '寰呭垽'},
+ {field: 'memo', align: 'center', title: '澶囨敞'},
+ {field: 'qty$', align: 'center', title: '鐘舵��', style: 'font-weight: bold'},
+ {field: 'source$', align: 'center', title: '鏄惁纭', style: 'font-weight: bold'}
]],
request: {
pageName: 'curr',
--
Gitblit v1.9.1