From 76366370a260dc9016bc2c3758ec86a7713b1437 Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期三, 10 七月 2024 08:32:18 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/mat/mat.js | 6 +++---
src/main/java/com/zy/asrs/entity/param/MatSyncParam.java | 2 +-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java b/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
index 91892e0..4d98452 100644
--- a/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
@@ -20,7 +20,7 @@
public List<MatParam> matDetails;
@Data
- public class MatParam{
+ public static class MatParam{
/**
* 鍟嗗搧缂栧彿
*/
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 7aa331b..bde5ff0 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -551,7 +551,7 @@
} else {
tagId = tagService.getTop().getId();
}
- mat.sync(param);
+ mat.sync(matParam);
// mat.setMatnr(param.getMatnr());
// mat.setMaktx(param.getMaktx());
// mat.setSpecs(param.getSpecs());
@@ -567,7 +567,7 @@
log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
}
} else {
- mat.sync(param);
+ mat.sync(matParam);
if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr",matParam.getMatnr()))) {
throw new CoolException("鏇存柊宸插瓨鍦ㄥ晢鍝佷俊鎭け璐ワ紝璇疯仈绯荤鐞嗗憳");
}
diff --git a/src/main/webapp/static/js/mat/mat.js b/src/main/webapp/static/js/mat/mat.js
index 2805440..c4ff202 100644
--- a/src/main/webapp/static/js/mat/mat.js
+++ b/src/main/webapp/static/js/mat/mat.js
@@ -5,9 +5,9 @@
var cols = [
{type: 'checkbox'}
,{field: 'tagId$', align: 'center',title: '褰掔被', templet: '#tagTpl'}
- ,{field: 'store_max', align: 'center',title: '搴撳瓨涓婇檺'}
- ,{field: 'store_min', align: 'center',title: '搴撳瓨涓嬮檺'}
- ,{field: 'store_max_date', align: 'center',title: '搴撻緞涓婇檺(澶�)'}
+ ,{field: 'storeMax', align: 'center',title: '搴撳瓨涓婇檺'}
+ ,{field: 'storeMin', align: 'center',title: '搴撳瓨涓嬮檺'}
+ ,{field: 'storeMaxDate', align: 'center',title: '搴撻緞涓婇檺(澶�)'}
];
cols.push.apply(cols, matCols);
cols.push(
--
Gitblit v1.9.1