From 06b612c123fbe56f69536d45633c2c7f428df526 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 14 三月 2024 19:27:07 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/agvLocDetl/locDetl.js | 8 +-
src/main/webapp/static/js/picking/picking.js | 4
src/main/webapp/views/mat/mat.html | 41 ++++++-------
src/main/webapp/static/js/manLocDetl/manLocDetl.js | 8 +-
src/main/webapp/static/js/locDetl/locDetl.js | 8 +-
src/main/webapp/static/js/orderLog/order.js | 8 +-
src/main/webapp/static/js/allLocDetl/locDetl.js | 8 +-
src/main/java/com/zy/asrs/entity/Mat.java | 4
src/main/webapp/static/js/order/order.js | 8 +-
src/main/webapp/static/js/inventoryVariance/inventoryVariance.js | 2
src/main/webapp/static/js/common.js | 18 +++---
src/main/java/com/zy/asrs/entity/param/MatInfoParam.java | 10 +-
src/main/webapp/static/js/manLocDetl/manLocDetlTemp.js | 8 +-
src/main/java/com/zy/asrs/entity/InventoryVariance.java | 6 +-
src/main/webapp/views/manLocDetl/manLocDetlTemp.html | 8 +-
15 files changed, 74 insertions(+), 75 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/InventoryVariance.java b/src/main/java/com/zy/asrs/entity/InventoryVariance.java
index 537f3ed..51a1456 100644
--- a/src/main/java/com/zy/asrs/entity/InventoryVariance.java
+++ b/src/main/java/com/zy/asrs/entity/InventoryVariance.java
@@ -9,15 +9,15 @@
@Data
@TableName("inventory_variance")
public class InventoryVariance {
- //瀛樿揣缂栫爜
+ //鍟嗗搧缂栫爜
private String matnr;
//閿�鍞鍗曞彿
private String csocode;
//閿�鍞鍗曡鍙�
private String isoseq;
- //ERP瀛樿揣鏁伴噺
+ //ERP鍟嗗搧鏁伴噺
private Double iquantity;
- //绔嬪簱瀛樿揣鏁伴噺
+ //绔嬪簱鍟嗗搧鏁伴噺
private Double anfme;
public InventoryVariance(String matnr, String csocode, String isoseq, Double iquantity, Double anfme){
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 84cf369..a167280 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -95,14 +95,14 @@
* 棰滆壊
*/
@ApiModelProperty(value= "棰滆壊")
- @ExcelProperty(value = "瀛樿揣鍒嗙被鍚嶇О")
+ @ExcelProperty(value = "鍟嗗搧鍒嗙被鍚嶇О")
private String color;
/**
* 鍝佺墝
*/
@ApiModelProperty(value= "鍝佺墝")
- @ExcelProperty(value = "瀛樿揣鍒嗙被缂栫爜")
+ @ExcelProperty(value = "鍟嗗搧鍒嗙被缂栫爜")
private String brand;
/**
diff --git a/src/main/java/com/zy/asrs/entity/param/MatInfoParam.java b/src/main/java/com/zy/asrs/entity/param/MatInfoParam.java
index d251b7c..60a7f9c 100644
--- a/src/main/java/com/zy/asrs/entity/param/MatInfoParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/MatInfoParam.java
@@ -6,18 +6,18 @@
/**
- * 瀛樿揣妗ｆ鍚屾 u8
+ * 鍟嗗搧妗ｆ鍚屾 u8
*/
@Data
public class MatInfoParam {
/*
- 瀛樿揣缂栫爜
+ 鍟嗗搧缂栫爜
*/
private String cinvcode;
/*
- 瀛樿揣鍚嶇О
+ 鍟嗗搧鍚嶇О
*/
private String cinvname;
@@ -27,12 +27,12 @@
private String cInvStd;
/*
- 瀛樿揣鍒嗙被缂栫爜
+ 鍟嗗搧鍒嗙被缂栫爜
*/
private String cinvccode;
/*
- 瀛樿揣鍒嗙被鍚嶇О
+ 鍟嗗搧鍒嗙被鍚嶇О
*/
private String cInvCName;
diff --git a/src/main/webapp/static/js/agvLocDetl/locDetl.js b/src/main/webapp/static/js/agvLocDetl/locDetl.js
index d408a1d..09a7de7 100644
--- a/src/main/webapp/static/js/agvLocDetl/locDetl.js
+++ b/src/main/webapp/static/js/agvLocDetl/locDetl.js
@@ -4,8 +4,8 @@
function getCol() {
var cols = [
{field: 'locNo', align: 'center',title: '搴撲綅鍙�'},
- {field: 'matnr', align: 'center',title: '瀛樿揣缂栫爜', sort:true}
- ,{field: 'maktx', align: 'center',title: '瀛樿揣鍚嶇О', sort:true}
+ {field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', sort:true}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�', width: 300}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
@@ -15,8 +15,8 @@
,{field: 'specs', align: 'center',title: '瑙勬牸鍨嬪彿', hide: false}
,{field: 'model', align: 'center',title: '閫氱敤鍨嬪彿', hide: false}
- ,{field: 'brand', align: 'center',title: '瀛樿揣鍒嗙被缂栫爜', hide: true}
- ,{field: 'color', align: 'center',title: '瀛樿揣鍒嗙被鍚嶇О', hide: true}
+ ,{field: 'brand', align: 'center',title: '鍟嗗搧鍒嗙被缂栫爜', hide: true}
+ ,{field: 'color', align: 'center',title: '鍟嗗搧鍒嗙被鍚嶇О', hide: true}
,{field: 'unit', align: 'center',title: '璁￠噺鍗曚綅', hide: true}
,{field: 'price', align: 'center',title: '杩涢」绋�', hide: true}
,{field: 'units', align: 'center',title: '閿�椤圭◣', hide: true}
diff --git a/src/main/webapp/static/js/allLocDetl/locDetl.js b/src/main/webapp/static/js/allLocDetl/locDetl.js
index 528176a..aa31830 100644
--- a/src/main/webapp/static/js/allLocDetl/locDetl.js
+++ b/src/main/webapp/static/js/allLocDetl/locDetl.js
@@ -4,8 +4,8 @@
var cols = [
{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
,{field: 'suppCode', align: 'center',title: '鏂欑鐮�', sort:true}
- ,{field: 'matnr', align: 'center',title: '瀛樿揣缂栫爜', sort:true}
- ,{field: 'maktx', align: 'center',title: '瀛樿揣鍚嶇О', sort:true}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', sort:true}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�', sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
@@ -14,8 +14,8 @@
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'specs', align: 'center',title: '瑙勬牸鍨嬪彿', hide: true}
,{field: 'model', align: 'center',title: '閫氱敤鍨嬪彿', hide: true}
- ,{field: 'brand', align: 'center',title: '瀛樿揣鍒嗙被缂栫爜', hide: true}
- ,{field: 'color', align: 'center',title: '瀛樿揣鍒嗙被鍚嶇О', hide: true}
+ ,{field: 'brand', align: 'center',title: '鍟嗗搧鍒嗙被缂栫爜', hide: true}
+ ,{field: 'color', align: 'center',title: '鍟嗗搧鍒嗙被鍚嶇О', hide: true}
,{field: 'unit', align: 'center',title: '璁￠噺鍗曚綅', hide: true}
,{field: 'price', align: 'center',title: '杩涢」绋�', hide: true}
,{field: 'units', align: 'center',title: '閿�椤圭◣', hide: true}
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 6e807b1..4bd50f0 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -181,9 +181,9 @@
}
var matCols = [
- {field: 'matnr', align: 'center',title: '瀛樿揣缂栫爜', width: 180}
+ {field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', width: 180}
//,{field: 'name', align: 'center',title: '绉诲姩绫诲瀷', hide: true}
- ,{field: 'maktx', align: 'center',title: '瀛樿揣鍚嶇О', width: 150}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 150}
,{field: 'specs', align: 'center',title: '瑙勬牸鍨嬪彿', hide: false}
,{field: 'beBatch$', align: 'center',title: '鐗╂枡棰戠巼', hide: false}
,{field: 'model', align: 'center',title: '閫氱敤鍨嬪彿', hide: true}
@@ -191,8 +191,8 @@
// ,{field: 'weight', align: 'center',title: '閲嶉噺', hide: false}
// ,{field: 'units', align: 'center',title: '鏀暟', hide: false}
// ,{field: 'origin', align: 'center',title: '鐗╂枡鐘舵��', hide: true}
- ,{field: 'brand', align: 'center',title: '瀛樿揣鍒嗙被缂栫爜', hide: true}
- ,{field: 'color', align: 'center',title: '瀛樿揣鍒嗙被鍚嶇О', hide: true}
+ ,{field: 'brand', align: 'center',title: '鍟嗗搧鍒嗙被缂栫爜', hide: true}
+ ,{field: 'color', align: 'center',title: '鍟嗗搧鍒嗙被鍚嶇О', hide: true}
,{field: 'unit', align: 'center',title: '璁￠噺鍗曚綅', hide: true}
,{field: 'price', align: 'center',title: '杩涢」绋�', hide: true}
,{field: 'units', align: 'center',title: '閿�椤圭◣', hide: true}
@@ -226,20 +226,20 @@
var detlCols = [
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: true}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: false}
- ,{field: 'matnr', align: 'center',title: '瀛樿揣缂栫爜',hide: true}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜',hide: true}
,{field: 'suppCode', align: 'center',title: '鏂欑鐮�', hide: false}
- ,{field: 'matnr', align: 'center',title: '瀛樿揣缂栫爜'}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�', width: 300, sort:true, hide: true}
- ,{field: 'maktx', align: 'center',title: '瀛樿揣鍚嶇О'}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
,{field: 'threeCode', align: 'center',title: '閿�鍞鍗曞彿'}
,{field: 'deadTime', align: 'center',title: '閿�鍞鍗曡鍙�'}
,{field: 'specs', align: 'center',title: '瑙勬牸鍨嬪彿', hide: false}
,{field: 'model', align: 'center',title: '閫氱敤鍨嬪彿', hide: false}
- ,{field: 'brand', align: 'center',title: '瀛樿揣鍒嗙被缂栫爜', hide: true}
- ,{field: 'color', align: 'center',title: '瀛樿揣鍒嗙被鍚嶇О', hide: true}
+ ,{field: 'brand', align: 'center',title: '鍟嗗搧鍒嗙被缂栫爜', hide: true}
+ ,{field: 'color', align: 'center',title: '鍟嗗搧鍒嗙被鍚嶇О', hide: true}
,{field: 'unit', align: 'center',title: '璁￠噺鍗曚綅', hide: true}
,{field: 'price', align: 'center',title: '杩涢」绋�', hide: true}
,{field: 'units', align: 'center',title: '閿�椤圭◣', hide: true}
diff --git a/src/main/webapp/static/js/inventoryVariance/inventoryVariance.js b/src/main/webapp/static/js/inventoryVariance/inventoryVariance.js
index de55347..dfc271e 100644
--- a/src/main/webapp/static/js/inventoryVariance/inventoryVariance.js
+++ b/src/main/webapp/static/js/inventoryVariance/inventoryVariance.js
@@ -2,7 +2,7 @@
var tableData;
function getCol() {
var cols = [
- {field: 'matnr', align: 'center',title: '瀛樿揣缂栫爜'}
+ {field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜'}
,{field: 'csocode', align: 'center',title: '閿�鍞鍗曞彿', sort:true}
,{field: 'isoseq', align: 'center',title: '閿�鍞鍗曡鍙�', sort:true}
,{field: 'iquantity', align: 'center',title: 'ERP瀛樿揣鏁伴噺', sort:true}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 9999628..1e4486e 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -4,8 +4,8 @@
var cols = [
{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
,{field: 'suppCode', align: 'center',title: '鏂欑鐮�', sort:true}
- ,{field: 'matnr', align: 'center',title: '瀛樿揣缂栫爜', sort:true}
- ,{field: 'maktx', align: 'center',title: '瀛樿揣鍚嶇О', sort:true}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', sort:true}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�', sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
@@ -14,8 +14,8 @@
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'specs', align: 'center',title: '瑙勬牸鍨嬪彿', hide: true}
,{field: 'model', align: 'center',title: '閫氱敤鍨嬪彿', hide: true}
- ,{field: 'brand', align: 'center',title: '瀛樿揣鍒嗙被缂栫爜', hide: true}
- ,{field: 'color', align: 'center',title: '瀛樿揣鍒嗙被鍚嶇О', hide: true}
+ ,{field: 'brand', align: 'center',title: '鍟嗗搧鍒嗙被缂栫爜', hide: true}
+ ,{field: 'color', align: 'center',title: '鍟嗗搧鍒嗙被鍚嶇О', hide: true}
,{field: 'unit', align: 'center',title: '璁￠噺鍗曚綅', hide: true}
,{field: 'price', align: 'center',title: '杩涢」绋�', hide: true}
,{field: 'units', align: 'center',title: '閿�椤圭◣', hide: true}
diff --git a/src/main/webapp/static/js/manLocDetl/manLocDetl.js b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
index 3ebc57b..affb874 100644
--- a/src/main/webapp/static/js/manLocDetl/manLocDetl.js
+++ b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
@@ -3,8 +3,8 @@
var cols = [
{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
,{field: 'containerCode', align: 'center',title: '鏂欐兂鐮�', sort:true}
- ,{field: 'matnr', align: 'center',title: '瀛樿揣缂栫爜', sort:true}
- ,{field: 'maktx', align: 'center',title: '瀛樿揣鍚嶇О', sort:true}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', sort:true}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'docNum', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'csocode', align: 'center',title: '閿�鍞鍗曞彿'}
@@ -12,8 +12,8 @@
,{field: 'zpallet', align: 'center',title: '鎵樼洏鐮�', hide: false}
,{field: 'specs', align: 'center',title: '瑙勬牸鍨嬪彿', hide: false}
,{field: 'model', align: 'center',title: '閫氱敤鍨嬪彿', hide: false}
- ,{field: 'brand', align: 'center',title: '瀛樿揣鍒嗙被缂栫爜', hide: true}
- ,{field: 'color', align: 'center',title: '瀛樿揣鍒嗙被鍚嶇О', hide: true}
+ ,{field: 'brand', align: 'center',title: '鍟嗗搧鍒嗙被缂栫爜', hide: true}
+ ,{field: 'color', align: 'center',title: '鍟嗗搧鍒嗙被鍚嶇О', hide: true}
,{field: 'unit', align: 'center',title: '璁￠噺鍗曚綅', hide: true}
,{field: 'price', align: 'center',title: '杩涢」绋�', hide: true}
,{field: 'units', align: 'center',title: '閿�椤圭◣', hide: true}
diff --git a/src/main/webapp/static/js/manLocDetl/manLocDetlTemp.js b/src/main/webapp/static/js/manLocDetl/manLocDetlTemp.js
index 3d2f0bf..2811255 100644
--- a/src/main/webapp/static/js/manLocDetl/manLocDetlTemp.js
+++ b/src/main/webapp/static/js/manLocDetl/manLocDetlTemp.js
@@ -3,8 +3,8 @@
var cols = [
{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
//,{field: 'containerCode', align: 'center',title: '鏂欑鐮�', sort:true}
- ,{field: 'matnr', align: 'center',title: '瀛樿揣缂栫爜', sort:true}
- ,{field: 'maktx', align: 'center',title: '瀛樿揣鍚嶇О', sort:true}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', sort:true}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
//,{field: 'docNum', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
// ,{field: 'csocode', align: 'center',title: '閿�鍞鍗曞彿'}
@@ -13,8 +13,8 @@
,{field: 'batch', align: 'center',title: '杞︽', hide: false}
,{field: 'specs', align: 'center',title: '瑙勬牸鍨嬪彿', hide: false}
,{field: 'model', align: 'center',title: '閫氱敤鍨嬪彿', hide: false}
- ,{field: 'brand', align: 'center',title: '瀛樿揣鍒嗙被缂栫爜', hide: true}
- ,{field: 'color', align: 'center',title: '瀛樿揣鍒嗙被鍚嶇О', hide: true}
+ ,{field: 'brand', align: 'center',title: '鍟嗗搧鍒嗙被缂栫爜', hide: true}
+ ,{field: 'color', align: 'center',title: '鍟嗗搧鍒嗙被鍚嶇О', hide: true}
,{field: 'unit', align: 'center',title: '璁￠噺鍗曚綅', hide: true}
,{field: 'price', align: 'center',title: '杩涢」绋�', hide: true}
,{field: 'units', align: 'center',title: '閿�椤圭◣', hide: true}
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index f61c83d..546c384 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -140,8 +140,8 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
- {field: 'matnr', title: '瀛樿揣缂栫爜', width: 160},
- {field: 'maktx', title: '瀛樿揣鍚嶇О', width: 160},
+ {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
+ {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
{field: 'batch', title: '鎵瑰彿'},
{field: 'anfme', title: '鏁伴噺'},
{field: 'qty', title: '浣滀笟鏁伴噺', style: 'font-weight: bold'},
@@ -252,8 +252,8 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers', title: '#'},
- {field: 'matnr', title: '瀛樿揣缂栫爜', width: 160},
- {field: 'maktx', title: '瀛樿揣鍚嶇О', width: 200},
+ {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
+ {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
{field: 'batch', title: '搴忓垪鐮�', edit: true},
{field: 'specs', title: '瑙勬牸'},
{field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
diff --git a/src/main/webapp/static/js/orderLog/order.js b/src/main/webapp/static/js/orderLog/order.js
index a079e7e..112eb9e 100644
--- a/src/main/webapp/static/js/orderLog/order.js
+++ b/src/main/webapp/static/js/orderLog/order.js
@@ -140,8 +140,8 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
- {field: 'matnr', title: '瀛樿揣缂栫爜', width: 160},
- {field: 'maktx', title: '瀛樿揣鍚嶇О', width: 160},
+ {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
+ {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
{field: 'batch', title: '鎵瑰彿'},
{field: 'anfme', title: '鏁伴噺'},
{field: 'qty', title: '浣滀笟鏁伴噺', style: 'font-weight: bold'},
@@ -252,8 +252,8 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers', title: '#'},
- {field: 'matnr', title: '瀛樿揣缂栫爜', width: 160},
- {field: 'maktx', title: '瀛樿揣鍚嶇О', width: 200},
+ {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
+ {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
{field: 'batch', title: '搴忓垪鐮�', edit: true},
{field: 'specs', title: '瑙勬牸'},
{field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
diff --git a/src/main/webapp/static/js/picking/picking.js b/src/main/webapp/static/js/picking/picking.js
index f3cb76c..a69bbba 100644
--- a/src/main/webapp/static/js/picking/picking.js
+++ b/src/main/webapp/static/js/picking/picking.js
@@ -128,8 +128,8 @@
,{field: 'docNum', align: 'center',title: '鎷ｈ揣鍗曞彿'}
//,{field: 'uuid', align: 'center',title: 'uuid'}
,{field: 'locNo', align: 'center',title: '搴撲綅'}
- ,{field: 'matnr', align: 'center',title: '瀛樿揣缂栫爜'}
- ,{field: 'maktx', align: 'center',title: '瀛樿揣鍚嶇О'}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜'}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'containerCode', align: 'center',title: '鏂欑鐮�'}
,{field: 'csocode', align: 'center',title: '閿�鍞鍗曞彿'}
diff --git a/src/main/webapp/views/manLocDetl/manLocDetlTemp.html b/src/main/webapp/views/manLocDetl/manLocDetlTemp.html
index 894fe53..068030e 100644
--- a/src/main/webapp/views/manLocDetl/manLocDetlTemp.html
+++ b/src/main/webapp/views/manLocDetl/manLocDetlTemp.html
@@ -46,15 +46,15 @@
<!-- 琛ㄦ牸宸ュ叿鏍�2 -->
<div id="search-box" class="layui-form toolbar" style="padding-top: 5px">
<div class="layui-inline">
- <label class="layui-form-label" style="padding: 8px 15px 8px 15px">瀛樿揣缂栫爜:</label>
+ <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍟嗗搧缂栫爜:</label>
<div class="layui-input-inline">
- <input name="matnr" style="width: 120px" class="layui-input" placeholder="杈撳叆瀛樿揣缂栫爜"/>
+ <input name="matnr" style="width: 120px" class="layui-input" placeholder="杈撳叆鍟嗗搧缂栫爜"/>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="padding: 8px 15px 8px 15px">瀛樿揣鍚嶇О:</label>
+ <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍟嗗搧鍚嶇О:</label>
<div class="layui-input-inline">
- <input name="maktx" style="width: 120px" class="layui-input" placeholder="杈撳叆瀛樿揣鍚嶇О"/>
+ <input name="maktx" style="width: 120px" class="layui-input" placeholder="杈撳叆鍟嗗搧鍚嶇О"/>
</div>
</div>
<div class="layui-inline">
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index 933ceb3..0d6cbd9 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -192,9 +192,9 @@
</div>
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">瀛樿揣鍚嶇О</label>
+ <label class="layui-form-label layui-form-required">鍟嗗搧鍚嶇О</label>
<div class="layui-input-block">
- <input name="maktx" placeholder="璇疯緭鍏ュ瓨璐у悕绉�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
+ <input name="maktx" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
</div>
</div>
<div class="layui-form-item">
@@ -209,24 +209,24 @@
<input name="storeMaxDate" placeholder="搴撻緞涓婇檺(澶�)" type="number" class="layui-input">
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label">瀛樿揣鍒嗙被缂栫爜</label>
+ <!--<div class="layui-form-item">
+ <label class="layui-form-label">鍟嗗搧鍒嗙被缂栫爜</label>
<div class="layui-input-block">
- <input name="brand" placeholder="璇疯緭鍏ュ瓨璐у垎绫荤紪鐮�" class="layui-input">
+ <input name="brand" placeholder="璇疯緭鍏ュ晢鍝佸垎绫荤紪鐮�" class="layui-input">
</div>
- </div>
+ </div>-->
<div class="layui-form-item">
<label class="layui-form-label">璁￠噺鍗曚綅</label>
<div class="layui-input-block">
<input name="unit" placeholder="璇疯緭鍏ヨ閲忓崟浣�" class="layui-input">
</div>
</div>
- <div class="layui-form-item">
+ <!--<div class="layui-form-item">
<label class="layui-form-label">杩涢」绋�</label>
<div class="layui-input-block">
<input name="price" placeholder="璇疯緭鍏ヨ繘椤圭◣" class="layui-input">
</div>
- </div>
+ </div>-->
<div class="layui-form-item">
<label class="layui-form-label">鐘舵��:</label>
<div class="layui-input-block">
@@ -241,9 +241,9 @@
<div class="layui-col-md6">
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">瀛樿揣缂栫爜</label>
+ <label class="layui-form-label layui-form-required">鍟嗗搧缂栫爜</label>
<div class="layui-input-block">
- <input id="matnr" name="matnr" placeholder="璇疯緭鍏ュ瓨璐х紪鐮�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
+ <input id="matnr" name="matnr" placeholder="璇疯緭鍏ュ晢鍝佺紪鐮�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
</div>
</div>
@@ -261,43 +261,42 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">閫氱敤鍨嬪彿</label>
+ <label class="layui-form-label">鍟嗗搧绫诲瀷</label>
<div class="layui-input-block">
<input name="model" placeholder="璇疯緭鍏ュ娉�" class="layui-input">
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label">瀛樿揣鍒嗙被鍚嶇О</label>
+ <!--<div class="layui-form-item">
+ <label class="layui-form-label">鍟嗗搧鍒嗙被鍚嶇О</label>
<div class="layui-input-block">
<input name="color" placeholder="璇疯緭鍏ュ娉�" class="layui-input">
</div>
- </div>
-
- <div class="layui-form-item">
+ </div>-->
+ <!--<div class="layui-form-item">
<label class="layui-form-label">閿�椤圭◣</label>
<div class="layui-input-block">
<input name="units" placeholder="璇疯緭鍏ラ攢椤圭◣" class="layui-input">
</div>
- </div>
- <div class="layui-form-item">
+ </div>-->
+ <!--<div class="layui-form-item">
<label class="layui-form-label">寤烘。浜�</label>
<div class="layui-input-block">
<input name="supp" placeholder="璇疯緭鍏ュ缓妗ｄ汉" class="layui-input">
</div>
- </div>
+ </div>-->
<div class="layui-form-item">
<label class="layui-form-label">澶囨敞</label>
<div class="layui-input-block">
<input name="memo" placeholder="璇疯緭鍏ュ娉�" class="layui-input">
</div>
</div>
- <div class="layui-form-item">
+ <!-- <div class="layui-form-item">
<label class="layui-form-label">鐗╂枡棰戠巼</label>
<div class="layui-input-block">
<input name="beBatch" type="number" placeholder="1涓洪珮棰戯紝鍏朵粬鍧囦负浣庨" class="layui-input">
</div>
- </div>
+ </div>-->
</div>
</div>
--
Gitblit v1.9.1