From 82e3d32282cd6bc07e36564306fe5c35fdfb89da Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期一, 23 九月 2024 17:16:32 +0800
Subject: [PATCH] bug修改，初步完成
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java | 2
zy-asrs-wms/src/main/resources/application.yml | 2
zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/SafeStoExcel.java | 30 +
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastLogController.java | 24
zy-asrs-common/src/main/resources/mapper/wms/ViewWorkInMapper.xml | 3
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinController.java | 3
zy-asrs-wms/src/main/webapp/views/matCode/matCode.html | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java | 1
zy-asrs-wms/src/main/webapp/views/waitPakinLog/waitPakinLog.html | 10
zy-asrs-wms/src/main/webapp/static/js/locDetl/locDetl.js | 217 +++++-----
zy-asrs-common/src/main/resources/mapper/wms/ViewInOutMapper.xml | 1
zy-asrs-wms/src/main/webapp/static/js/waitPakin/waitPakin.js | 5
zy-asrs-common/src/main/java/com/zy/asrs/common/web/BaseController.java | 108 +++-
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java | 2
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakin.java | 5
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlLogController.java | 32 +
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlController.java | 59 +-
zy-asrs-wms/src/main/webapp/views/orderDetl/orderDetl.html | 2
zy-asrs-wms/src/main/webapp/views/waitPakin/waitPakin.html | 7
zy-asrs-wms/src/main/webapp/views/wrkMast/wrkMast.html | 2
zy-asrs-wms/src/main/webapp/views/locDetl/locDetl.html | 2
zy-asrs-wms/src/main/webapp/static/js/matCode/matCode.js | 2
zy-asrs-common/src/main/java/com/zy/asrs/common/utils/SafeStoExcelListener.java | 97 ++++
zy-asrs-wms/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js | 2
zy-asrs-wms/src/main/webapp/views/wrkDetl/wrkDetl.html | 12
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java | 6
zy-asrs-wms/src/main/webapp/views/pakStore/matQuery.html | 10
zy-asrs-wms/src/main/webapp/views/prior/prior.html | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java | 15
zy-asrs-wms/src/main/webapp/static/js/wrkMast/wrkMast.js | 7
zy-asrs-wms/src/main/webapp/static/js/safeSto/safeSto.js | 150 +++++--
zy-asrs-wms/src/main/webapp/views/locDetlStatis/locDetlStatis.html | 5
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java | 2
zy-asrs-wms/src/main/webapp/static/js/common.js | 284 +++++++------
zy-asrs-wms/src/main/webapp/views/safeSto/safeSto.html | 4
zy-asrs-wms/src/main/webapp/static/js/node/node.js | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/AdjDetlController.java | 1
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinLogController.java | 9
zy-asrs-wms/src/main/webapp/views/wrkMastLog/wrkMastLog.html | 7
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/PriorController.java | 37 +
zy-asrs-wms/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js | 2
41 files changed, 764 insertions(+), 411 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/SafeStoExcel.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/SafeStoExcel.java
new file mode 100644
index 0000000..22819c5
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/SafeStoExcel.java
@@ -0,0 +1,30 @@
+package com.zy.asrs.common.domain.entity;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.zy.asrs.common.wms.entity.Mat;
+import lombok.Data;
+
+/**
+ * 0.A 1.B 2.C 3.D 4.E 5.F 6.G 7.H 8.I
+ * 9.J 10.K 11.L 12.M 13.N 14.O 15.P 16.Q 17.R 18.S
+ * 19.T 20.U 21.V 22.W 23.X 24.Y 25.Z
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class SafeStoExcel extends Mat {
+
+ @ExcelProperty(index = 0, value = "鍟嗗搧缂栧彿")
+ private String matnr;
+
+ @ExcelProperty(index = 1, value = "搴撲綅鍙�")
+ private String locNo;
+
+ @ExcelProperty(index = 2, value = "瀹夊叏搴撳瓨")
+ private Double safeQua;
+
+ @ExcelProperty(index = 3, value = "澶囨敞")
+ private String memo;
+
+
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/SafeStoExcelListener.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/SafeStoExcelListener.java
new file mode 100644
index 0000000..fe03d25
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/SafeStoExcelListener.java
@@ -0,0 +1,97 @@
+package com.zy.asrs.common.utils;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.common.domain.entity.SafeStoExcel;
+import com.zy.asrs.common.wms.entity.Mat;
+import com.zy.asrs.common.wms.entity.Prior;
+import com.zy.asrs.common.wms.service.MatService;
+import com.zy.asrs.common.wms.service.PriorService;
+import com.zy.asrs.framework.common.SnowflakeIdWorker;
+import com.zy.asrs.framework.common.SpringUtils;
+import com.zy.asrs.framework.exception.CoolException;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by vincent on 2019-11-25
+ */
+@Slf4j
+public class SafeStoExcelListener extends AnalysisEventListener<SafeStoExcel> {
+
+ private int total = 0;
+ private Long userId;
+ private Long hostId;
+
+ public SafeStoExcelListener() {
+ }
+
+ public SafeStoExcelListener(Long userId, Long hostId) {
+ this.userId = userId;
+ this.hostId = hostId;
+ }
+
+ /**
+ * 姣忛殧5鏉″瓨鍌ㄦ暟鎹簱锛屽疄闄呬娇鐢ㄤ腑鍙互3000鏉★紝鐒跺悗娓呯悊list 锛屾柟渚垮唴瀛樺洖鏀�
+ */
+ private static final int BATCH_COUNT = 50;
+
+ private final List<SafeStoExcel> list = new ArrayList<>();
+
+ /**
+ * 杩欓噷浼氫竴琛岃鐨勮繑鍥炲ご
+ */
+ @Override
+ public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+ }
+
+ /**
+ * 杩欎釜姣忎竴鏉℃暟鎹В鏋愰兘浼氭潵璋冪敤
+ */
+ @Override
+ public void invoke(SafeStoExcel excel, AnalysisContext ctx) {
+ MatService matService = SpringUtils.getBean(MatService.class);
+ PriorService priorService = SpringUtils.getBean(PriorService.class);
+ SnowflakeIdWorker snowflakeIdWorker = SpringUtils.getBean(SnowflakeIdWorker.class);
+ Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, excel.getMatnr()).eq(Mat::getHostId, hostId));
+ if (mat != null) {
+ Prior prior = new Prior();
+ prior.setHostId(hostId);
+ prior.setUuid("SP" + snowflakeIdWorker.nextId());
+ prior.setMatId(mat.getId());
+ prior.setMatnr(mat.getMatnr());
+ prior.setMaktx(mat.getMaktx());
+ prior.setLocNo(excel.getLocNo());
+ prior.setSafeQua(excel.getSafeQua());
+ prior.setCreateBy(userId);
+ prior.setCreateTime(new Date());
+ prior.setUpdateBy(userId);
+ prior.setUpdateTime(new Date());
+ prior.setStatus(1);
+ prior.setMemo(excel.getMemo());
+ if (!priorService.save(prior)) {
+ throw new CoolException("鏁版嵁淇濆瓨澶辫触");
+ } else {
+ total++;
+ }
+ }
+ }
+
+ /**
+ * 鎵�鏈夋暟鎹В鏋愬畬鎴愪簡璋冪敤
+ * 閫傚悎浜嬪姟
+ */
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext ctx) {
+ log.info("鏂板{}鏉″畨鍏ㄥ簱瀛樹俊鎭紒", total);
+ }
+
+ public int getTotal() {
+ return total;
+ }
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/web/BaseController.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/web/BaseController.java
index 55bd786..8ef4122 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/web/BaseController.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/web/BaseController.java
@@ -1,7 +1,6 @@
package com.zy.asrs.common.web;
import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -39,7 +38,7 @@
@Autowired
private TagService tagService;
- protected Long getHostId(){
+ protected Long getHostId() {
if (getUserId() == 9527) {
return null;
}
@@ -58,11 +57,11 @@
}
}
- protected Long getUserId(){
+ protected Long getUserId() {
return Long.parseLong(String.valueOf(request.getAttribute("userId")));
}
- protected User getUser(){
+ protected User getUser() {
User user = userService.getById(getUserId());
if (null == user) {
throw new CoolException(BaseRes.DENIED);
@@ -70,10 +69,10 @@
return user;
}
- protected String getComment(Class<?> cls, String fieldName){
+ protected String getComment(Class<?> cls, String fieldName) {
Field[] fields = Cools.getAllFields(cls);
- for (Field field : fields){
- if (fieldName.equals(field.getName())){
+ for (Field field : fields) {
+ if (fieldName.equals(field.getName())) {
return field.getAnnotation(ApiModelProperty.class).value();
}
}
@@ -82,6 +81,7 @@
/**
* 鍒嗛〉缁勮
+ *
* @param pageNumber
* @param pageSize
* @param map
@@ -89,7 +89,7 @@
* @param <T>
* @return
*/
- protected <T> Page<T> toPage(Integer pageNumber, Integer pageSize, Map<String, Object> map, Class<T> cls){
+ protected <T> Page<T> toPage(Integer pageNumber, Integer pageSize, Map<String, Object> map, Class<T> cls) {
// 鍒嗛〉绱㈠紩鍜屽崟椤垫暟閲忕粍瑁�
pageNumber = Optional.ofNullable(pageNumber).orElse(1);
pageSize = Optional.ofNullable(pageSize).orElse(10);
@@ -100,10 +100,8 @@
// 鍏ㄥ瓧娈垫ā绯婃悳绱� todo
if (!Cools.isEmpty(map.get("condition"))) {
Set<String> columns = new HashSet<>();
- for (Field field : Cools.getAllFields(cls)){
- if (Modifier.isFinal(field.getModifiers())
- || Modifier.isStatic(field.getModifiers())
- || Modifier.isTransient(field.getModifiers())){
+ for (Field field : Cools.getAllFields(cls)) {
+ if (Modifier.isFinal(field.getModifiers()) || Modifier.isStatic(field.getModifiers()) || Modifier.isTransient(field.getModifiers())) {
continue;
}
String column = null;
@@ -117,54 +115,53 @@
columns.add(column);
}
}
- columns.forEach(col->map.put(col, map.get("condition")));
+ columns.forEach(col -> map.put(col, map.get("condition")));
}
// page.setCondition(map);
return page;
}
- protected Tag getOriginTag(){
+ protected Tag getOriginTag() {
return tagService.getTop(getHostId());
}
/**
* 鍏ㄥ瓧娈垫ā绯婃悳绱�
- * @param cls 妯″瀷绫�
- * @param set 鎺掗櫎瀛楁闆嗗悎
+ *
+ * @param cls 妯″瀷绫�
+ * @param set 鎺掗櫎瀛楁闆嗗悎
* @param condition 鎼滅储鍐呭
*/
- protected <T> void allLike(Class<T> cls, Set<String> set, QueryWrapper<T> wrapper, String condition){
+ protected <T> void allLike(Class<T> cls, Set<String> set, QueryWrapper<T> wrapper, String condition) {
if (Cools.isEmpty(condition)) {
return;
}
final List<String> columns = new ArrayList<>();
- for (Field field :Cools.getAllFields(cls)){
- if (Modifier.isFinal(field.getModifiers())
- || Modifier.isStatic(field.getModifiers())
- || Modifier.isTransient(field.getModifiers())){
+ for (Field field : Cools.getAllFields(cls)) {
+ if (Modifier.isFinal(field.getModifiers()) || Modifier.isStatic(field.getModifiers()) || Modifier.isTransient(field.getModifiers())) {
continue;
}
String column = null;
if (field.isAnnotationPresent(TableField.class)) {
- column = field.getAnnotation(TableField.class).value();
+ column = camelToUnderscore(field.getAnnotation(TableField.class).value());
}
if (Cools.isEmpty(column)) {
- column = field.getName();
+ column = camelToUnderscore(field.getName());
}
- if (!set.contains(column)) {
- columns.add(column);
- }
+ //if (!set.contains(column)) {
+ columns.add(column);
+ //}
}
if (columns.isEmpty()) {
return;
}
- wrapper.and( w -> {
- for (int i=0;i<columns.size();i++){
+ wrapper.and(w -> {
+ for (int i = 0; i < columns.size(); i++) {
String colums = columns.get(i);
- if (i==0){
+ if (i == 0) {
w.like(colums, condition);
- }else {
+ } else {
w.or().like(colums, condition);
}
}
@@ -181,4 +178,55 @@
// }
}
+ private static String camelToUnderscore(String camelCase) {
+ return camelCase.replaceAll("([a-z])([A-Z])", "$1_$2").toLowerCase();
+ }
+
+// /**
+// * 鍏ㄥ瓧娈垫ā绯婃悳绱�
+// *
+// * @param cls 妯″瀷绫�
+// * @param set 鎺掗櫎瀛楁闆嗗悎
+// * @param condition 鎼滅储鍐呭
+// */
+// protected <T> void allLike(Class<T> cls, Set<String> set, LambdaQueryWrapper<T> wrapper, String condition) {
+// if (Cools.isEmpty(condition)) {
+// return;
+// }
+// final List<String> columns = new ArrayList<>();
+// for (Field field : Cools.getAllFields(cls)) {
+// if (Modifier.isFinal(field.getModifiers()) || Modifier.isStatic(field.getModifiers()) || Modifier.isTransient(field.getModifiers())) {
+// continue;
+// }
+// String column = null;
+// if (field.isAnnotationPresent(TableField.class)) {
+// column = camelToUnderscore(field.getAnnotation(TableField.class).value());
+// }
+// if (Cools.isEmpty(column)) {
+// column = camelToUnderscore(field.getName());
+// }
+// //if (!set.contains(column)) {
+// columns.add(column);
+// //}
+// }
+// if (columns.isEmpty()) {
+// return;
+// }
+//
+// SFunction<cls, String> columnFunc = Entity::columnName;
+// wrapper.and(w -> {
+// for (int i = 0; i < columns.size(); i++) {
+// String colums = columns.get(i);
+// if (i == 0) {
+// w.like(colums, condition);
+// } else {
+// w.or().like(colums, condition);
+// }
+// }
+// });
+//
+//
+// }
+
+
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java
index 808b950..9bb182e 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java
@@ -48,6 +48,7 @@
* 鎵樼洏鏉＄爜
*/
@ApiModelProperty(value= "鎵樼洏鏉＄爜")
+ @TableField("zpallet")
private String zpallet;
/**
@@ -214,6 +215,7 @@
private Long hostId;
@ApiModelProperty(value= "璐т富")
+ @TableField("owner")
private String owner;
public LocDetl() {}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
index 7c4dd27..a996127 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
@@ -256,9 +256,11 @@
private String locationStock;
//鏉愯川
+ @TableField("material")
private String material;
//鍒朵护
+ @TableField("decrees")
private String decrees;
//鍥惧彿
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakin.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakin.java
index a203c24..56afcf7 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakin.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakin.java
@@ -3,15 +3,12 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.baomidou.mybatisplus.annotation.*;
import com.zy.asrs.common.utils.Synchro;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/ViewInOutMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/ViewInOutMapper.xml
index d1c436e..21be101 100644
--- a/zy-asrs-common/src/main/resources/mapper/wms/ViewInOutMapper.xml
+++ b/zy-asrs-common/src/main/resources/mapper/wms/ViewInOutMapper.xml
@@ -15,6 +15,7 @@
select * from asr_sta_inout_view
where 1=1
<include refid="viewInOutConditionSql"></include>
+ order by ymd desc
</select>
</mapper>
\ No newline at end of file
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/ViewWorkInMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/ViewWorkInMapper.xml
index 258045c..a8c311c 100644
--- a/zy-asrs-common/src/main/resources/mapper/wms/ViewWorkInMapper.xml
+++ b/zy-asrs-common/src/main/resources/mapper/wms/ViewWorkInMapper.xml
@@ -78,6 +78,7 @@
select * from asr_wrkin_view
where 1=1
<include refid="viewWorkInConditionSql"></include>
+ order by io_time desc
</select>
<!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
@@ -85,6 +86,7 @@
select * from asr_wrkin_view
where 1=1
<include refid="viewWorkInConditionMapSql"></include>
+ order by io_time desc
</select>
<!-- 鍑哄簱缁熻 -->
@@ -94,6 +96,7 @@
from asr_wrkout_view
where 1=1
<include refid="viewWorkInConditionSql"></include>
+ order by io_time desc
</select>
<!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/AdjDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/AdjDetlController.java
index 8831ced..d101eca 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/AdjDetlController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/AdjDetlController.java
@@ -54,6 +54,7 @@
if (!Cools.isEmpty(param.get("matnr"))) {
wrapper.like(AdjDetl::getMatnr, param.get("matnr"));
}
+ wrapper.orderByDesc(AdjDetl::getModiTime);
return R.ok(adjDetlService.page(new Page<>(curr, limit), wrapper));
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
index d95c320..45fd7af 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
@@ -150,12 +150,6 @@
@RequestParam(required = false) String timeRange,
@RequestParam Map<String, Object> param) {
QueryWrapper<LocDetl> wrapper = new QueryWrapper<>();
- Object barcode = null;
- if (!Cools.isEmpty(param.get("barcode"))) {
- barcode = param.get("barcode");
- }
- param.remove("zpallet");
- param.remove("barcode");
if (!Cools.isEmpty(param.get("decrees"))) {
ArrayList<String> mats = new ArrayList<>();
@@ -167,7 +161,6 @@
mats.add(mat.getMatnr());
}
}
-
wrapper.in("matnr", mats);
param.remove("decrees");
}
@@ -183,18 +176,16 @@
wrapper.le("appe_time", DateUtils.convert(range[1]));
}
if (!Cools.isEmpty(param.get("locNo"))) {
- wrapper.eq("loc_no", param.get("locNo"));
+ wrapper.like("loc_no", param.get("locNo"));
}
- if (!Cools.isEmpty(barcode)) {
- wrapper.eq("zpallet", barcode);
+ if (!Cools.isEmpty(param.get("zpallet"))) {
+ wrapper.like("zpallet", param.get("zpallet"));
}
if (!Cools.isEmpty(orderByField)){
wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));
}
-
-
param.remove("locNo");
param.remove("owner");
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
index c355fac..6b784d5 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
@@ -3,12 +3,14 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.domain.entity.Parameter;
import com.zy.asrs.common.domain.entity.Shelves;
import com.zy.asrs.common.domain.param.LocMastInitParam;
import com.zy.asrs.common.wms.entity.LocDetl;
import com.zy.asrs.common.wms.entity.LocMast;
+import com.zy.asrs.common.wms.entity.Mat;
import com.zy.asrs.common.wms.service.LocDetlService;
import com.zy.asrs.common.wms.service.LocMastService;
import com.zy.asrs.framework.annotations.ManagerAuth;
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java
index 4f5915a..ddce902 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java
@@ -72,13 +72,13 @@
treeUtils.getTagIdList(Long.parseLong(tagId.toString()), nodes);
wrapper.in("tag_id", nodes);
if (!Cools.isEmpty(param.get("matnr"))) {
- wrapper.eq("matnr", param.get("matnr"));
+ wrapper.like("matnr", param.get("matnr"));
}
if (!Cools.isEmpty(param.get("maktx"))) {
- wrapper.eq("maktx", param.get("maktx"));
+ wrapper.like("maktx", param.get("maktx"));
}
if (!Cools.isEmpty(param.get("decrees"))) {
- wrapper.eq("decrees", param.get("decrees"));
+ wrapper.like("decrees", param.get("decrees"));
}
// if (!Cools.isEmpty(param.get("owner$"))) {
// wrapper.eq("owner", param.get("owner$"));
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/PriorController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/PriorController.java
index 93bd2f2..960e9be 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/PriorController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/PriorController.java
@@ -1,5 +1,7 @@
package com.zy.asrs.wms.controller;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -7,6 +9,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.domain.dto.SafeStoDo;
import com.zy.asrs.common.domain.dto.SafeStoDto;
+import com.zy.asrs.common.domain.entity.LocInPrintMatExcel;
+import com.zy.asrs.common.domain.entity.MatExcel;
+import com.zy.asrs.common.domain.entity.SafeStoExcel;
+import com.zy.asrs.common.utils.MatExcelListener;
+import com.zy.asrs.common.utils.SafeStoExcelListener;
import com.zy.asrs.common.wms.entity.Mat;
import com.zy.asrs.common.wms.entity.Prior;
import com.zy.asrs.common.wms.service.MatService;
@@ -19,7 +26,11 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
import java.util.*;
@RestController
@@ -177,4 +188,30 @@
return R.ok();
}
+
+ @PostMapping(value = "/safeSto/excel/import/auth")
+ @ManagerAuth(memo = "瀹夊叏搴撳瓨鏁版嵁瀵煎叆")
+ @Transactional
+ public R matExcelImport(MultipartFile file) throws IOException {
+ SafeStoExcelListener listener = new SafeStoExcelListener(getUserId(), getHostId());
+ EasyExcel.read(file.getInputStream(), SafeStoExcel.class, listener).sheet().doRead();
+ return R.ok("鎴愬姛鍚屾"+listener.getTotal()+"鏉″畨鍏ㄥ簱瀛樻暟鎹�");
+ }
+
+
+ /**
+ * excel瀵煎叆妯℃澘涓嬭浇
+ */
+ @RequestMapping(value = "/safeSto/excel/import/mould")
+ public void matExcelImportMould(HttpServletResponse response) throws IOException {
+ List<SafeStoExcel> excels = new ArrayList<>();
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding("utf-8");
+ String fileName = URLEncoder.encode("瀹夊叏搴撳瓨Excel瀵煎叆妯℃澘", "UTF-8");
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+ EasyExcel.write(response.getOutputStream(), SafeStoExcel.class)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .sheet("sheet1")
+ .doWrite(excels);
+ }
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinController.java
index cd49b75..243b26a 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinController.java
@@ -67,9 +67,6 @@
@RequestParam Map<String, Object> param) {
QueryWrapper<WaitPakin> wrapper = new QueryWrapper<>();
wrapper.eq("host_id", getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like("id", condition);
- }
convert(param,wrapper);
if (!Cools.isEmpty(timeRange)) {
String[] range = timeRange.split(RANGE_TIME_LINK);
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinLogController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinLogController.java
index f7cff63..23b70a9 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinLogController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinLogController.java
@@ -39,14 +39,17 @@
@RequestParam Map<String, Object> param) {
LambdaQueryWrapper<WaitPakinLog> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(WaitPakinLog::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(WaitPakinLog::getId, condition);
- }
if (!Cools.isEmpty(timeRange)) {
String[] range = timeRange.split(RANGE_TIME_LINK);
wrapper.ge(WaitPakinLog::getAppeTime, DateUtils.convert(range[0]));
wrapper.le(WaitPakinLog::getAppeTime, DateUtils.convert(range[1]));
}
+ if (!Cools.isEmpty(param.get("zpallet"))) {
+ wrapper.like(WaitPakinLog::getZpallet, param.get("zpallet"));
+ }
+ if (!Cools.isEmpty(param.get("matnr"))) {
+ wrapper.like(WaitPakinLog::getMatnr, param.get("matnr"));
+ }
return R.ok(waitPakinLogService.page(new Page<>(curr, limit), wrapper));
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlController.java
index 1296e1a..dc499ea 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlController.java
@@ -1,21 +1,26 @@
package com.zy.asrs.wms.controller;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zy.asrs.common.web.BaseController;
import com.zy.asrs.common.wms.entity.WrkDetl;
import com.zy.asrs.common.wms.service.WrkDetlService;
import com.zy.asrs.framework.annotations.ManagerAuth;
import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.DateUtils;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@RestController
public class WrkDetlController extends BaseController {
@@ -36,25 +41,33 @@
@RequestParam(required = false) String condition,
@RequestParam(required = false) String timeRange,
@RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<WrkDetl> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(WrkDetl::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(WrkDetl::getId, condition);
- }
+ QueryWrapper<WrkDetl> wrapper = new QueryWrapper<>();
+ wrapper.eq("host_id", getHostId());
+// if (!Cools.isEmpty(condition)) {
+// wrapper.like(WrkDetl::getId, condition);
+// }
if (!Cools.isEmpty(timeRange)) {
String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(WrkDetl::getAppeTime, DateUtils.convert(range[0]));
- wrapper.le(WrkDetl::getAppeTime, DateUtils.convert(range[1]));
+ wrapper.ge("io_time", DateUtils.convert(range[0]));
+ wrapper.le("io_time", DateUtils.convert(range[1]));
}
if (!Cools.isEmpty(param.get("wrk_mast_id"))) {
- wrapper.eq(WrkDetl::getWrkMastId, param.get("wrk_mast_id"));
+ wrapper.eq("wrk_mast_id", param.get("wrk_mast_id"));
}
if (!Cools.isEmpty(param.get("matnr"))) {
- wrapper.like(WrkDetl::getMatnr, param.get("matnr"));
+ wrapper.like("matnr", param.get("matnr"));
}
if (!Cools.isEmpty(param.get("maktx"))) {
- wrapper.like(WrkDetl::getMaktx, param.get("maktx"));
+ wrapper.like("maktx", param.get("maktx"));
}
+ if (!Cools.isEmpty(param.get("zpallet"))) {
+ wrapper.like("zpallet", param.get("zpallet"));
+ }
+ if (!Cools.isEmpty(param.get("orderNo"))) {
+ wrapper.like("order_no", param.get("orderNo"));
+ }
+ allLike(WrkDetl.class, param.keySet(), wrapper, condition);
+ wrapper.orderByDesc("io_time");
return R.ok(wrkDetlService.page(new Page<>(curr, limit), wrapper));
}
@@ -67,10 +80,10 @@
return R.ok();
}
- @RequestMapping(value = "/wrkDetl/update/auth")
- @ManagerAuth
- public R update(WrkDetl wrkDetl){
- if (Cools.isEmpty(wrkDetl) || null==wrkDetl.getId()){
+ @RequestMapping(value = "/wrkDetl/update/auth")
+ @ManagerAuth
+ public R update(WrkDetl wrkDetl) {
+ if (Cools.isEmpty(wrkDetl) || null == wrkDetl.getId()) {
return R.error();
}
wrkDetlService.updateById(wrkDetl);
@@ -79,8 +92,8 @@
@RequestMapping(value = "/wrkDetl/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
wrkDetlService.removeById(id);
}
return R.ok();
@@ -94,7 +107,7 @@
wrapper.like(WrkDetl::getId, condition);
Page<WrkDetl> page = wrkDetlService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (WrkDetl wrkDetl : page.getRecords()){
+ for (WrkDetl wrkDetl : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", wrkDetl.getId());
map.put("value", wrkDetl.getId());
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlLogController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlLogController.java
index 67a1221..b11a982 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlLogController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlLogController.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.wms.entity.WrkDetl;
import com.zy.asrs.common.wms.entity.WrkDetlLog;
@@ -37,20 +38,33 @@
@RequestParam(required = false) String condition,
@RequestParam(required = false) String timeRange,
@RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<WrkDetlLog> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(WrkDetlLog::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(WrkDetlLog::getId, condition);
- }
+ QueryWrapper<WrkDetlLog> wrapper = new QueryWrapper<>();
+ wrapper.eq("host_id", getHostId());
+// if (!Cools.isEmpty(condition)) {
+// wrapper.like(WrkDetl::getId, condition);
+// }
if (!Cools.isEmpty(timeRange)) {
String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(WrkDetlLog::getAppeTime, DateUtils.convert(range[0]));
- wrapper.le(WrkDetlLog::getAppeTime, DateUtils.convert(range[1]));
+ wrapper.ge("io_time", DateUtils.convert(range[0]));
+ wrapper.le("io_time", DateUtils.convert(range[1]));
}
if (!Cools.isEmpty(param.get("wrk_mast_id"))) {
- wrapper.eq(WrkDetlLog::getWrkMastId, param.get("wrk_mast_id"));
+ wrapper.eq("wrk_mast_id", param.get("wrk_mast_id"));
}
- wrapper.orderByDesc(WrkDetlLog::getId);
+ if (!Cools.isEmpty(param.get("matnr"))) {
+ wrapper.like("matnr", param.get("matnr"));
+ }
+ if (!Cools.isEmpty(param.get("maktx"))) {
+ wrapper.like("maktx", param.get("maktx"));
+ }
+ if (!Cools.isEmpty(param.get("zpallet"))) {
+ wrapper.like("zpallet", param.get("zpallet"));
+ }
+ if (!Cools.isEmpty(param.get("orderNo"))) {
+ wrapper.like("order_no", param.get("orderNo"));
+ }
+ allLike(WrkDetlLog.class, param.keySet(), wrapper, condition);
+ wrapper.orderByDesc("io_time");
return R.ok(wrkDetlLogService.page(new Page<>(curr, limit), wrapper));
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java
index c1b98e0..9cf3197 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java
@@ -40,6 +40,7 @@
excludeTrash(param);
QueryWrapper<WrkMast> wrapper = new QueryWrapper<>();
wrapper.eq("host_id",getHostId());
+ System.out.println(param);
convert(param, wrapper);
return R.ok(wrkMastService.page(new Page<>(curr, limit), wrapper));
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastLogController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastLogController.java
index 962d6d6..ca3d690 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastLogController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastLogController.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.wms.entity.WrkMastLog;
import com.zy.asrs.common.wms.service.WrkMastLogService;
@@ -36,29 +37,30 @@
@RequestParam(required = false) String condition,
@RequestParam(required = false) String timeRange,
@RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<WrkMastLog> wrapper = new LambdaQueryWrapper<>();
+ QueryWrapper<WrkMastLog> wrapper = new QueryWrapper<>();
// wrapper.eq(WrkMastLog::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(WrkMastLog::getWrkNo, condition);
- }
if (!Cools.isEmpty(timeRange)) {
String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(WrkMastLog::getAppeTime, DateUtils.convert(range[0]));
- wrapper.le(WrkMastLog::getAppeTime, DateUtils.convert(range[1]));
+ wrapper.ge("appe_time", DateUtils.convert(range[0]));
+ wrapper.le("appe_time", DateUtils.convert(range[1]));
+ }
+ if (!Cools.isEmpty(param.get("barcode"))) {
+ wrapper.eq("barcode", param.get("barcode"));
}
if (!Cools.isEmpty(param.get("wrkNo"))) {
- wrapper.eq(WrkMastLog::getWrkNo, param.get("wrkNo"));
+ wrapper.eq("wrk_no", param.get("wrkNo"));
}
if (!Cools.isEmpty(param.get("wrkSts"))) {
- wrapper.eq(WrkMastLog::getWrkSts, param.get("wrkSts"));
+ wrapper.eq("wrk_sts", param.get("wrkSts"));
}
if (!Cools.isEmpty(param.get("ioType"))) {
- wrapper.eq(WrkMastLog::getIoType, param.get("ioType"));
+ wrapper.eq("iotype", param.get("ioType"));
}
if (!Cools.isEmpty(param.get("manuType"))) {
- wrapper.like(WrkMastLog::getManuType, param.get("manuType"));
+ wrapper.like("manu_type", param.get("manuType"));
}
- wrapper.orderByDesc(WrkMastLog::getId);
+ allLike(WrkMastLog.class, param.keySet(), wrapper, condition);
+ wrapper.orderByDesc("id");
return R.ok(wrkMastLogService.page(new Page<>(curr, limit), wrapper));
}
diff --git a/zy-asrs-wms/src/main/resources/application.yml b/zy-asrs-wms/src/main/resources/application.yml
index cb3a039..3c90d11 100644
--- a/zy-asrs-wms/src/main/resources/application.yml
+++ b/zy-asrs-wms/src/main/resources/application.yml
@@ -10,7 +10,7 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=ncasrs
+ url: jdbc:sqlserver://192.168.4.34:1433;databasename=ncasrs
# url: jdbc:sqlserver://localhost:1433;databasename=jmasrs
# username: sa
# password: sa@123
diff --git a/zy-asrs-wms/src/main/webapp/static/js/common.js b/zy-asrs-wms/src/main/webapp/static/js/common.js
index f0e5933..d797ca9 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/common.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/common.js
@@ -6,7 +6,7 @@
var detailWidth = '90%';
// 闈炵┖鍒ゆ柇
-function isEmpty(obj){
+function isEmpty(obj) {
return typeof obj == "undefined" || obj == null || obj === "";
}
@@ -34,7 +34,7 @@
if (p < 10) {
p = "00" + p;
}
- if (p < 100) {
+ if (p < 100) {
p = "0" + p;
}
return y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s + "," + p;
@@ -54,7 +54,7 @@
// 娓呯悊瀵硅薄null鍊�
function reObject(data) {
for (var obj in data) {
- if (data[obj]===null){
+ if (data[obj] === null) {
delete data[obj];
}
}
@@ -71,29 +71,29 @@
}
// 鏉冮檺
-function limit(child){
- if (child == null){
+function limit(child) {
+ if (child == null) {
child = false;
}
- var param = (child?parent.window:window).location.href.split("?")[1];
+ var param = (child ? parent.window : window).location.href.split("?")[1];
if (null != param) {
var resourceId = getQueryVariable('resourceId')
if (resourceId == false) {
resourceId = param.split("=")[1];
}
$.ajax({
- url: baseUrl+"/power/menu/"+resourceId+"/auth",
+ url: baseUrl + "/power/menu/" + resourceId + "/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
async: false,
success: function (res) {
- if (res.code === 200){
- for(var i = 0, len = res.data.length; i < len; i++) {
- (child?parent:window).$('#'+res.data[i].code).css("display", "inline-block");
- (child?parent:window).$('.'+res.data[i].code).css("display", "inline-block");
+ if (res.code === 200) {
+ for (var i = 0, len = res.data.length; i < len; i++) {
+ (child ? parent : window).$('#' + res.data[i].code).css("display", "inline-block");
+ (child ? parent : window).$('.' + res.data[i].code).css("display", "inline-block");
}
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
} else {
layer.msg(res.msg)
}
@@ -121,11 +121,11 @@
timeout: 10000,
cache: false,
success: function (res) {
- if (res.code === 200){
+ if (res.code === 200) {
callback(res);
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- } else {
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
layer.msg(res.msg);
}
},
@@ -152,11 +152,11 @@
timeout: 10000,
cache: false,
success: function (res) {
- if (res.code === 200){
+ if (res.code === 200) {
callback(res);
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- } else {
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
layer.msg(res.msg);
}
},
@@ -173,155 +173,161 @@
/*************************************************************************************************************/
/********************************************** 鐗╂枡涓氬姟鎶借薄 ***************************************************/
+
/*************************************************************************************************************/
function arrRemove(arr, key, val) {
- for(var i=arr.length-1; i>=0; i--){
- if(arr[i][key] === val){
- arr.splice(i,1);
+ for (var i = arr.length - 1; i >= 0; i--) {
+ if (arr[i][key] === val) {
+ arr.splice(i, 1);
}
}
}
var matCols = [
- {field: 'matnr', align: 'center',title: '鍝佸彿', width: 180, sort:true}
+ {field: 'matnr', align: 'center', title: '鍝佸彿', width: 180, sort: true}
// {field: 'id', align: 'center',title: 'ID'}
// ,{field: 'uuid', align: 'center',title: '缂栧彿'}
// ,{field: 'tagId$', align: 'center',title: '鎵�灞炲綊绫�'}
- ,{field: 'maktx', align: 'center',title: '鍚嶇О', width: 200, sort:true}
+ , {field: 'maktx', align: 'center', title: '鍚嶇О', width: 200, sort: true}
// ,{field: 'name', align: 'center',title: '鍒悕'}
- ,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'model', align: 'center',title: '鏈哄瀷', hide: false}
- ,{field: 'decrees', align: 'center',title: '鍒朵护', hide: false, sort:true}
- ,{field: 'imgNum', align: 'center',title: '鍥惧彿', hide: false}
- ,{field: 'weight', align: 'center',title: '閲嶉噺', hide: false}
- ,{field: 'length', align: 'center',title: '闀垮害', hide: false}
- ,{field: 'width', align: 'center',title: '瀹藉害', hide: false}
- ,{field: 'height', align: 'center',title: '楂樺害', hide: false}
+ , {field: 'specs', align: 'center', title: '瑙勬牸'}
+ , {field: 'model', align: 'center', title: '鏈哄瀷', hide: false}
+ , {field: 'decrees', align: 'center', title: '鍒朵护', hide: false, sort: true}
+ , {field: 'imgNum', align: 'center', title: '鍥惧彿', hide: false}
+ , {field: 'weight', align: 'center', title: '閲嶉噺', hide: false}
+ , {field: 'length', align: 'center', title: '闀垮害', hide: false}
+ , {field: 'width', align: 'center', title: '瀹藉害', hide: false}
+ , {field: 'height', align: 'center', title: '楂樺害', hide: false}
- ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
- ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
- ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
- ,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
- ,{field: 'sku', align: 'center',title: 'sku', hide: true}
- ,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
- ,{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: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
- ,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
+ , {field: 'color', align: 'center', title: '棰滆壊', hide: true}
+ , {field: 'brand', align: 'center', title: '鍝佺墝', hide: true}
+ , {field: 'unit', align: 'center', title: '鍗曚綅', hide: true}
+ , {field: 'price', align: 'center', title: '鍗曚环', hide: true}
+ , {field: 'sku', align: 'center', title: 'sku', hide: true}
+ , {field: 'units', align: 'center', title: '鍗曚綅閲�', hide: true}
+ , {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: 'itemNum', align: 'center', title: '鍝侀」鏁�', hide: true}
+ , {field: 'safeQty', align: 'center', title: '瀹夊叏搴撳瓨閲�', hide: true}
- ,{field: 'threeCode', align: 'center',title: '涓夋柟缂栫爜', hide: true}
- ,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
- ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
- ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
- ,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
- ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
- ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
- ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
- ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
+ , {field: 'threeCode', align: 'center', title: '涓夋柟缂栫爜', hide: true}
+ , {field: 'supp', align: 'center', title: '渚涘簲鍟�', hide: true}
+ , {field: 'suppCode', align: 'center', title: '渚涘簲鍟嗙紪鐮�', hide: true}
+ , {field: 'beBatch$', align: 'center', title: '鏄惁鎵规', hide: true}
+ , {field: 'deadTime', align: 'center', title: '淇濊川鏈�', hide: true}
+ , {field: 'deadWarn', align: 'center', title: '棰勮澶╂暟', hide: true}
+ , {field: 'source$', align: 'center', title: '鍒惰喘', hide: true}
+ , {field: 'check$', align: 'center', title: '瑕佹眰妫�楠�', hide: true}
+ , {field: 'danger$', align: 'center', title: '鍗遍櫓鍝�', hide: true}
// ,{field: 'status$', align: 'center',title: '鐘舵��'}
// ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
// ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳', hide: true}
- ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
- ,{field: 'memo', align: 'center',title: '澶囨敞', hide: false}
+ , {field: 'updateBy$', align: 'center', title: '淇敼浜哄憳', hide: true}
+ , {field: 'updateTime$', align: 'center', title: '淇敼鏃堕棿', hide: true}
+ , {field: 'memo', align: 'center', title: '澶囨敞', hide: false}
]
var detlCols = [
- {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: 80, sort:true}
- ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
- ,{field: 'owner', align: 'center',title: '璐т富'}
- ,{field: 'fullPlt$', align: 'center',title: '鏄惁婊℃澘'}
- ,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'templet', align: 'center',title: '鏈哄瀷',templet:function(row){
- if(row.mat$) {
- return row.mat$.model
+ {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: 80, sort: true}
+ , {field: 'anfme', align: 'center', title: '鏁伴噺'}
+ , {field: 'zpallet', align: 'center', title: '鎵樼洏鏉＄爜', sort: true}
+ , {field: 'owner', align: 'center', title: '璐т富'}
+ , {field: 'fullPlt$', align: 'center', title: '鏄惁婊℃澘'}
+ , {field: 'specs', align: 'center', title: '瑙勬牸'}
+ , {
+ field: 'templet', align: 'center', title: '鏈哄瀷', templet: function (row) {
+ if (row.mat$) {
+ return row.mat$.model
+ }
}
- }}
- ,{field: 'templet', align: 'center',title: '鍒朵护',templet:function(row){
- if (row.mat$) {
- return row.mat$.decrees;
+ }
+ , {
+ field: 'templet', align: 'center', title: '鍒朵护', templet: function (row) {
+ if (row.mat$) {
+ return row.mat$.decrees;
+ }
}
- }}
+ }
- ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
- ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
- ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
- ,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
- ,{field: 'sku', align: 'center',title: 'sku', hide: true}
- ,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
- ,{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: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
- ,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
- ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true}
- ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
- ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
- ,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
- ,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
- ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
- ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
- ,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
- ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
- ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
- ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
- ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
+ , {field: 'color', align: 'center', title: '棰滆壊', hide: true}
+ , {field: 'brand', align: 'center', title: '鍝佺墝', hide: true}
+ , {field: 'unit', align: 'center', title: '鍗曚綅', hide: true}
+ , {field: 'price', align: 'center', title: '鍗曚环', hide: true}
+ , {field: 'sku', align: 'center', title: 'sku', hide: true}
+ , {field: 'units', align: 'center', title: '鍗曚綅閲�', hide: true}
+ , {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: 'itemNum', align: 'center', title: '鍝侀」鏁�', hide: true}
+ , {field: 'safeQty', align: 'center', title: '瀹夊叏搴撳瓨閲�', hide: true}
+ , {field: 'weight', align: 'center', title: '鍗曠鍑�閲�', hide: true}
+ , {field: 'length', align: 'center', title: '鍗曠姣涢噸', hide: true}
+ , {field: 'volume', align: 'center', title: '鍗曠浣撶Н', hide: true}
+ , {field: 'threeCode', align: 'center', title: '绠卞瓙灏哄', hide: true}
+ , {field: 'supp', align: 'center', title: '渚涘簲鍟�', hide: true}
+ , {field: 'suppCode', align: 'center', title: '渚涘簲鍟嗙紪鐮�', hide: true}
+ , {field: 'beBatch$', align: 'center', title: '鏄惁鎵规', hide: true}
+ , {field: 'deadTime', align: 'center', title: '淇濊川鏈�', hide: true}
+ , {field: 'deadWarn', align: 'center', title: '棰勮澶╂暟', hide: true}
+ , {field: 'source$', align: 'center', title: '鍒惰喘', hide: true}
+ , {field: 'check$', align: 'center', title: '瑕佹眰妫�楠�', hide: true}
+ , {field: 'danger$', align: 'center', title: '鍗遍櫓鍝�', hide: true}
]
var detlColsWrkDetl = [
- {field: 'matnr', align: 'center',title: '鍝佸彿', sort:true, width: 150}
- ,{field: 'maktx', align: 'center',title: '鍚嶇О', sort:true, width: 150}
- ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
- ,{field: 'orderType', align: 'center',title: '鍗曟嵁绫诲瀷', hide: false}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 80, sort:true}
- ,{field: 'anfme', align: 'center',title: '鏁伴噺', width: 70}
- ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', width: 100}
- ,{field: 'owner', align: 'center',title: '璐т富', width: 80}
- ,{field: 'fullPlt$', align: 'center',title: '鏄惁婊℃澘', width: 100}
- ,{field: 'specs', align: 'center',title: '瑙勬牸', width: 80}
- ,{field: 'model', align: 'center',title: '浠ｇ爜', hide: false}
- ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
- ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
- ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
- ,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
- ,{field: 'sku', align: 'center',title: 'sku', hide: true}
- ,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
- ,{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: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
- ,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
- ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: false}
- ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: false}
- ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: false}
- ,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: false}
- ,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
- ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
- ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
- ,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
- ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
- ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
- ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
- ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
+ {field: 'matnr', align: 'center', title: '鍝佸彿', sort: true, width: 150}
+ , {field: 'maktx', align: 'center', title: '鍚嶇О', sort: true, width: 150}
+ , {field: 'orderNo', align: 'center', title: '鍗曟嵁缂栧彿', sort: true, hide: false}
+ , {field: 'orderType', align: 'center', title: '鍗曟嵁绫诲瀷', hide: false}
+ , {field: 'batch', align: 'center', title: '鎵瑰彿', width: 80, sort: true}
+ , {field: 'anfme', align: 'center', title: '鏁伴噺', width: 70}
+ , {field: 'zpallet', align: 'center', title: '鎵樼洏鏉＄爜', sort: true, width: 100}
+ , {field: 'owner', align: 'center', title: '璐т富', width: 80}
+ , {field: 'fullPlt$', align: 'center', title: '鏄惁婊℃澘', width: 100}
+ , {field: 'specs', align: 'center', title: '瑙勬牸', width: 80}
+ , {field: 'model', align: 'center', title: '浠ｇ爜', hide: false}
+ , {field: 'color', align: 'center', title: '棰滆壊', hide: true}
+ , {field: 'brand', align: 'center', title: '鍝佺墝', hide: true}
+ , {field: 'unit', align: 'center', title: '鍗曚綅', hide: true}
+ , {field: 'price', align: 'center', title: '鍗曚环', hide: true}
+ , {field: 'sku', align: 'center', title: 'sku', hide: true}
+ , {field: 'units', align: 'center', title: '鍗曚綅閲�', hide: true}
+ , {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: 'itemNum', align: 'center', title: '鍝侀」鏁�', hide: true}
+ , {field: 'safeQty', align: 'center', title: '瀹夊叏搴撳瓨閲�', hide: true}
+ , {field: 'weight', align: 'center', title: '鍗曠鍑�閲�', hide: false}
+ , {field: 'length', align: 'center', title: '鍗曠姣涢噸', hide: false}
+ , {field: 'volume', align: 'center', title: '鍗曠浣撶Н', hide: false}
+ , {field: 'threeCode', align: 'center', title: '绠卞瓙灏哄', hide: false}
+ , {field: 'supp', align: 'center', title: '渚涘簲鍟�', hide: true}
+ , {field: 'suppCode', align: 'center', title: '渚涘簲鍟嗙紪鐮�', hide: true}
+ , {field: 'beBatch$', align: 'center', title: '鏄惁鎵规', hide: true}
+ , {field: 'deadTime', align: 'center', title: '淇濊川鏈�', hide: true}
+ , {field: 'deadWarn', align: 'center', title: '棰勮澶╂暟', hide: true}
+ , {field: 'source$', align: 'center', title: '鍒惰喘', hide: true}
+ , {field: 'check$', align: 'center', title: '瑕佹眰妫�楠�', hide: true}
+ , {field: 'danger$', align: 'center', title: '鍗遍櫓鍝�', hide: true}
]
-function getQueryVariable(variable)
-{
+function getQueryVariable(variable) {
var query = window.location.search.substring(1);
var vars = query.split("&");
- for (var i=0;i<vars.length;i++) {
+ for (var i = 0; i < vars.length; i++) {
var pair = vars[i].split("=");
- if(pair[0] == variable){return pair[1];}
+ if (pair[0] == variable) {
+ return pair[1];
+ }
}
- return(false);
+ return (false);
}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js b/zy-asrs-wms/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js
index bff82e3..f587fb6 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js
@@ -30,7 +30,7 @@
,{field: 'staNo$', align: 'center',title: '鐩爣绔�', hide:true}
,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�', hide:true}
,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅', hide:true}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜', hide:true}
+ ,{field: 'barcode', align: 'center',title: '鎵樼洏鐮�', hide:true}
,{field: 'updMk', align: 'center',title: '寮傚父鏍囪'}
,{field: 'errorTime$', align: 'center',title: '寮傚父璁板綍鏃堕棿'}
,{field: 'errorMemo', align: 'center',title: '寮傚父鍐呭'}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/locDetl/locDetl.js b/zy-asrs-wms/src/main/webapp/static/js/locDetl/locDetl.js
index c948a57..8c8aeeb 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/locDetl/locDetl.js
@@ -1,60 +1,66 @@
var pageCurr;
+
function getCol() {
var cols = [
- {field: 'locNo', align: 'center',title: '搴撲綅鍙�'},
- {field: 'matnr', align: 'center',title: '鍝佸彿', sort:true}
- ,{field: 'maktx', align: 'center',title: '鍚嶇О', sort:true}
- ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
- ,{field: 'orderType', align: 'center',title: '鍗曟嵁绫诲瀷', hide: false}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 80, sort:true}
- ,{field: 'anfme', align: 'center',title: '鏁伴噺', width: 100}
- ,{field: 'zpallet', align: 'center',title: '鎵樼洏鐮�'}
- ,{field: 'templet', align: 'center',title: '鏈哄瀷',templet:function(row){
- return row.mat$.model
- }}
- ,{field: 'templet', align: 'center',title: '鍒朵护',templet:function(row){
+ {field: 'locNo', align: 'center', title: '搴撲綅鍙�'},
+ {field: 'matnr', align: 'center', title: '鍝佸彿', sort: true}
+ , {field: 'maktx', align: 'center', title: '鍚嶇О', sort: true}
+ , {field: 'orderNo', align: 'center', title: '鍗曟嵁缂栧彿', hide: false}
+ , {field: 'orderType', align: 'center', title: '鍗曟嵁绫诲瀷', hide: false}
+ , {field: 'batch', align: 'center', title: '鎵瑰彿', width: 80, sort: true}
+ , {field: 'anfme', align: 'center', title: '鏁伴噺', width: 100}
+ , {field: 'zpallet', align: 'center', title: '鎵樼洏鐮�', sort: true}
+ , {
+ field: 'templet', align: 'center', title: '鏈哄瀷', templet: function (row) {
+ return row.mat$.model
+ }
+ }
+ , {
+ field: 'templet', align: 'center', title: '鍒朵护', templet: function (row) {
return row.mat$.decrees
- }}
- ,{field: 'memo', align: 'center',title: '澶囨敞'}
+ }
+ }
+ , {field: 'owner', align: 'center', title: '璐т富'}
+ , {field: 'memo', align: 'center', title: '澶囨敞'}
// ,{field: 'owner$', align: 'center',title: '鎷ユ湁鑰�'}
- ,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
- ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
- ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
- ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
- ,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
- ,{field: 'sku', align: 'center',title: 'sku', hide: true}
- ,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
- ,{field: 'origin', align: 'center',title: '浠撳簱鍙�', hide: false}
- ,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
- ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
- ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
- ,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
- ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true}
- ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
- ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
- ,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
- ,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
- ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
- ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
- ,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
- ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
- ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
- ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
- ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
+ , {field: 'specs', align: 'center', title: '瑙勬牸'}
+ , {field: 'model', align: 'center', title: '浠ｇ爜', hide: true}
+ , {field: 'color', align: 'center', title: '棰滆壊', hide: true}
+ , {field: 'brand', align: 'center', title: '鍝佺墝', hide: true}
+ , {field: 'unit', align: 'center', title: '鍗曚綅', hide: true}
+ , {field: 'price', align: 'center', title: '鍗曚环', hide: true}
+ , {field: 'sku', align: 'center', title: 'sku', hide: true}
+ , {field: 'units', align: 'center', title: '鍗曚綅閲�', hide: true}
+ , {field: 'barcode', align: 'center', title: '鏉＄爜', hide: true}
+ , {field: 'origin', align: 'center', title: '浠撳簱鍙�', hide: false}
+ , {field: 'manu', align: 'center', title: '鍘傚', hide: true}
+ , {field: 'manuDate', align: 'center', title: '鐢熶骇鏃ユ湡', hide: true}
+ , {field: 'itemNum', align: 'center', title: '鍝侀」鏁�', hide: true}
+ , {field: 'safeQty', align: 'center', title: '瀹夊叏搴撳瓨閲�', hide: true}
+ , {field: 'weight', align: 'center', title: '鍗曠鍑�閲�', hide: true}
+ , {field: 'length', align: 'center', title: '鍗曠姣涢噸', hide: true}
+ , {field: 'volume', align: 'center', title: '鍗曠浣撶Н', hide: true}
+ , {field: 'threeCode', align: 'center', title: '绠卞瓙灏哄', hide: true}
+ , {field: 'supp', align: 'center', title: '渚涘簲鍟�', hide: true}
+ , {field: 'suppCode', align: 'center', title: '渚涘簲鍟嗙紪鐮�', hide: true}
+ , {field: 'beBatch$', align: 'center', title: '鏄惁鎵规', hide: true}
+ , {field: 'deadTime', align: 'center', title: '淇濊川鏈�', hide: true}
+ , {field: 'deadWarn', align: 'center', title: '棰勮澶╂暟', hide: true}
+ , {field: 'source$', align: 'center', title: '鍒惰喘', hide: true}
+ , {field: 'check$', align: 'center', title: '瑕佹眰妫�楠�', hide: true}
+ , {field: 'danger$', align: 'center', title: '鍗遍櫓鍝�', hide: true}
];
// cols.push.apply(cols, detlCols);
- cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',hide: true}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+ cols.push({field: 'modiUser$', align: 'center', title: '淇敼浜哄憳', hide: true}
+ , {field: 'modiTime$', align: 'center', title: '淇敼鏃堕棿'}
)
return cols;
}
-layui.use(['table','laydate', 'form'], function(){
+layui.use(['table', 'laydate', 'form'], function () {
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
@@ -65,10 +71,10 @@
tableIns = table.render({
elem: '#locDetl',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/locDetl/page/auth',
+ url: baseUrl + '/locDetl/page/auth',
page: true,
limit: 20,
- where:{
+ where: {
unreason: false
},
limits: [20, 30, 50, 100, 200, 500],
@@ -91,17 +97,17 @@
response: {
statusCode: 200
},
- done: function(res, curr, count) {
+ done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
}
- pageCurr=curr;
+ pageCurr = curr;
limit();
form.on('checkbox(tableCheckbox)', function (data) {
- var _index = $(data.elem).attr('table-index')||0;
- if(data.elem.checked){
+ var _index = $(data.elem).attr('table-index') || 0;
+ if (data.elem.checked) {
res.data[_index][data.value] = 'Y';
- }else{
+ } else {
res.data[_index][data.value] = 'N';
}
});
@@ -111,7 +117,7 @@
// 鐩戝惉鎺掑簭浜嬩欢
table.on('sort(locDetl)', function (obj) {
var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
+ $.each($('#search-box [name]').serializeArray(), function () {
searchData[this.name] = this.value;
});
searchData['orderByField'] = obj.field;
@@ -123,9 +129,9 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
}
- pageCurr=curr;
+ pageCurr = curr;
limit();
}
});
@@ -134,7 +140,7 @@
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
table.on('toolbar(locDetl)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
- switch(obj.event) {
+ switch (obj.event) {
case 'addData':
layer.open({
type: 2,
@@ -143,10 +149,11 @@
area: [top.detailWidth, top.detailHeight],
shadeClose: false,
content: 'locDetl_detail.html',
- success: function(layero, index){
+ success: function (layero, index) {
layer.getChildFrame('#data-detail-submit-edit', index).hide();
clearFormVal(layer.getChildFrame('#detail', index));
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layer.iframeAuto(index);
+ layer.style(index, {top: (($(window).height() - layer.getChildFrame('#data-detail', index).height()) / 3) + "px"});
}
});
break;
@@ -160,22 +167,22 @@
break;
case 'deleteData':
var data = checkStatus.data;
- if (data.length === 0){
+ if (data.length === 0) {
layer.msg('璇烽�夋嫨鏁版嵁');
} else {
- layer.confirm('纭畾鍒犻櫎'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
+ layer.confirm('纭畾鍒犻櫎' + (data.length === 1 ? '姝�' : data.length) + '鏉℃暟鎹悧', function () {
$.ajax({
- url: baseUrl+"/locDetl/delete/auth",
+ url: baseUrl + "/locDetl/delete/auth",
headers: {'token': localStorage.getItem('token')},
data: {param: JSON.stringify(data)},
method: 'POST',
- traditional:true,
+ traditional: true,
success: function (res) {
- if (res.code === 200){
+ if (res.code === 200) {
layer.closeAll();
tableReload(false);
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
} else {
layer.msg(res.msg)
}
@@ -185,9 +192,9 @@
}
break;
case 'exportData':
- layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
- var titles=[];
- var fields=[];
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function () {
+ var titles = [];
+ var fields = [];
obj.config.cols[0].map(function (col) {
if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
titles.push(col.title);
@@ -195,7 +202,7 @@
}
});
var exportData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
+ $.each($('#search-box [name]').serializeArray(), function () {
exportData[this.name] = this.value;
});
var param = {
@@ -204,17 +211,17 @@
};
var loadIndex = layer.msg('姝ｅ湪瀵煎嚭...', {icon: 16, shade: 0.01, time: false});
$.ajax({
- url: baseUrl+"/locDetl/export/auth",
+ url: baseUrl + "/locDetl/export/auth",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify(param),
- dataType:'json',
- contentType:'application/json;charset=UTF-8',
+ dataType: 'json',
+ contentType: 'application/json;charset=UTF-8',
method: 'POST',
success: function (res) {
layer.close(loadIndex);
layer.closeAll();
if (res.code === 200) {
- res.data.forEach((item,index) => {
+ res.data.forEach((item, index) => {
if (item[0] != null) {
item[0] = "'" + item[0];
}
@@ -225,9 +232,9 @@
item[2] = "'" + item[2];
}
})
- table.exportFile(titles,res.data,'xls');
+ table.exportFile(titles, res.data, 'xls');
} else if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
} else {
layer.msg(res.msg)
}
@@ -296,7 +303,7 @@
});
// 鐩戝惉琛屽伐鍏蜂簨浠�
- table.on('tool(locDetl)', function(obj){
+ table.on('tool(locDetl)', function (obj) {
var data = obj.data;
switch (obj.event) {
// 璇︽儏
@@ -308,11 +315,12 @@
area: [top.detailWidth, top.detailHeight],
shadeClose: false,
content: 'locDetl_detail.html',
- success: function(layero, index){
+ success: function (layero, index) {
setFormVal(layer.getChildFrame('#detail', index), data, true);
top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layer.iframeAuto(index);
+ layer.style(index, {top: (($(window).height() - layer.getChildFrame('#data-detail', index).height()) / 3) + "px"});
layero.find('iframe')[0].contentWindow.layui.form.render('select');
layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
}
@@ -327,12 +335,13 @@
area: [top.detailWidth, top.detailHeight],
shadeClose: false,
content: 'locDetl_detail.html',
- success: function(layero, index){
+ success: function (layero, index) {
layer.getChildFrame('#data-detail-submit-save', index).hide();
setFormVal(layer.getChildFrame('#detail', index), data, false);
top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
top.convertDisabled(layer.getChildFrame('#locNo,#matnr', index), true);
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layer.iframeAuto(index);
+ layer.style(index, {top: (($(window).height() - layer.getChildFrame('#data-detail', index).height()) / 3) + "px"});
layero.find('iframe')[0].contentWindow.layui.form.render('select');
layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
}
@@ -344,7 +353,7 @@
// 鏁版嵁淇濆瓨鍔ㄤ綔
form.on('submit(save)', function () {
- if (banMsg != null){
+ if (banMsg != null) {
layer.msg(banMsg);
return;
}
@@ -356,9 +365,9 @@
method("update")
});
- function method(name){
+ function method(name) {
var index = layer.load(1, {
- shade: [0.5,'#000'] //0.1閫忔槑搴︾殑鑳屾櫙
+ shade: [0.5, '#000'] //0.1閫忔槑搴︾殑鑳屾櫙
});
var data = {
// id: $('#id').val(),
@@ -382,20 +391,20 @@
};
$.ajax({
- url: baseUrl+"/locDetl/"+name+"/auth",
+ url: baseUrl + "/locDetl/" + name + "/auth",
headers: {'token': localStorage.getItem('token')},
data: top.reObject(data),
method: 'POST',
success: function (res) {
- if (res.code === 200){
+ if (res.code === 200) {
parent.layer.closeAll();
parent.$(".layui-laypage-btn")[0].click();
$("#data-detail :input").each(function () {
$(this).val("");
});
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
layer.msg(res.msg)
}
layer.close(index);
@@ -441,9 +450,9 @@
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
}
- pageCurr=curr;
+ pageCurr = curr;
limit();
}
@@ -464,7 +473,7 @@
});
// 鍏抽棴鍔ㄤ綔
-$(document).on('click','#data-detail-close', function () {
+$(document).on('click', '#data-detail-close', function () {
parent.layer.closeAll();
});
@@ -472,7 +481,7 @@
var searchData = {
unreason: false
};
- $.each($('#search-box [name]').serializeArray(), function() {
+ $.each($('#search-box [name]').serializeArray(), function () {
searchData[this.name] = this.value;
});
(child ? parent.tableIns : tableIns).reload({
@@ -482,14 +491,14 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
}
- pageCurr=curr;
+ pageCurr = curr;
if (res.data.length === 0 && count !== 0) {
tableIns.reload({
where: searchData,
page: {
- curr: pageCurr-1
+ curr: pageCurr - 1
}
});
pageCurr -= 1;
@@ -502,10 +511,10 @@
function setFormVal(el, data, showImg) {
for (var val in data) {
var find = el.find(":input[id='" + val + "']");
- if (find[0]!=null){
- if (find[0].type === 'checkbox'){
- if (data[val]==='Y'){
- find.attr("checked","checked");
+ if (find[0] != null) {
+ if (find[0].type === 'checkbox') {
+ if (data[val] === 'Y') {
+ find.attr("checked", "checked");
find.val('Y');
} else {
find.remove("checked");
@@ -515,9 +524,9 @@
}
}
find.val(data[val]);
- if (showImg){
+ if (showImg) {
var next = find.next();
- if (next.get(0)){
+ if (next.get(0)) {
if (next.get(0).localName === "img") {
find.hide();
next.attr("src", data[val]);
@@ -537,13 +546,13 @@
function detailScreen(index) {
var detail = layer.getChildFrame('#data-detail', index);
- var height = detail.height()+60;
- if (height > ($(window).height()*0.9)) {
- height = ($(window).height()*0.8);
+ var height = detail.height() + 60;
+ if (height > ($(window).height() * 0.9)) {
+ height = ($(window).height() * 0.8);
}
layer.style(index, {
// top: (($(window).height()-height)/3)+"px",
- height: height+'px'
+ height: height + 'px'
});
}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/matCode/matCode.js b/zy-asrs-wms/src/main/webapp/static/js/matCode/matCode.js
index e9f9cc7..0603665 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/matCode/matCode.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/matCode/matCode.js
@@ -25,7 +25,7 @@
cols: [[
{type: 'checkbox'}
,{field: 'matNo', align: 'center',title: '鐗╂枡缂栫爜'}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜'}
+ ,{field: 'barcode', align: 'center',title: '鎵樼洏鐮�'}
,{field: 'matName', align: 'center',title: '鐗╂枡鍚嶇О'}
,{field: 'str1', align: 'center',title: '鐗╂枡鍗曚綅'}
,{field: 'str2', align: 'center',title: '鐗╂枡瑙勬牸'}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/node/node.js b/zy-asrs-wms/src/main/webapp/static/js/node/node.js
index a103eb5..6dc7054 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/node/node.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/node/node.js
@@ -35,7 +35,7 @@
,{field: 'level', align: 'center',title: '绛夌骇'}
,{field: 'leading', align: 'center',title: '璐熻矗浜�'}
,{field: 'sort', align: 'center',title: '鎺掑簭'}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜'}
+ ,{field: 'barcode', align: 'center',title: '鎵樼洏鐮�'}
,{field: 'major', align: 'center',title: '鎺ㄨ崘浣�'}
,{field: 'status$', align: 'center',title: '鐘舵��'}
,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/safeSto/safeSto.js b/zy-asrs-wms/src/main/webapp/static/js/safeSto/safeSto.js
index 6be70a5..bad03ce 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/safeSto/safeSto.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/safeSto/safeSto.js
@@ -1,21 +1,23 @@
var pageCurr;
+var admin;
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
-}).use(['table','laydate', 'form', 'element', 'admin', 'xmSelect'], function(){
+}).use(['table', 'laydate', 'form', 'element', 'admin', 'xmSelect'], function () {
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
var layDate = layui.laydate;
var form = layui.form;
var element = layui.element;
- var admin = layui.admin;
+ admin = layui.admin;
var xmSelect = layui.xmSelect;
+
// 鏁版嵁娓叉煋
tableIns = table.render({
elem: '#safeSto',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/safeSto/list/auth',
+ url: baseUrl + '/safeSto/list/auth',
page: true,
limit: 16,
limits: [16, 30, 50, 100, 200, 500],
@@ -23,14 +25,14 @@
cellMinWidth: 50,
cols: [[
{type: 'numbers', fixed: 'left'}
- ,{field: 'locNo$', align: 'center',title: '搴撲綅'}
- ,{field: 'matnr', align: 'center',title: '鍝佸彿'}
- ,{field: 'maktx', align: 'center',title: '鍚嶇О'}
- ,{field: 'progress', align: 'center',title: '浣跨敤鎯呭喌', templet: '#progressTpl', width: 350}
- ,{field: 'status', align: 'center',title: '璀︽姤', templet: '#statusTpl', width: 100}
- ,{field: 'safeQua', align: 'center',title: '瀹夊叏搴撳瓨閲�', style: 'font-weight: bold'}
- ,{field: 'amount', align: 'center',title: '褰撳墠搴撳瓨閲�', style: 'font-weight: bold; color: #2d8cf0'}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ , {field: 'locNo$', align: 'center', title: '搴撲綅'}
+ , {field: 'matnr', align: 'center', title: '鍝佸彿'}
+ , {field: 'maktx', align: 'center', title: '鍚嶇О'}
+ , {field: 'progress', align: 'center', title: '浣跨敤鎯呭喌', templet: '#progressTpl', width: 350}
+ , {field: 'status', align: 'center', title: '璀︽姤', templet: '#statusTpl', width: 100}
+ , {field: 'safeQua', align: 'center', title: '瀹夊叏搴撳瓨閲�', style: 'font-weight: bold'}
+ , {field: 'amount', align: 'center', title: '褰撳墠搴撳瓨閲�', style: 'font-weight: bold; color: #2d8cf0'}
+ , {fixed: 'right', title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 120}
]],
request: {
pageName: 'curr',
@@ -47,12 +49,12 @@
response: {
statusCode: 200
},
- done: function(res, curr, count) {
+ done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
}
element.render('progress')
- pageCurr=curr;
+ pageCurr = curr;
limit();
}
});
@@ -61,13 +63,13 @@
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
table.on('toolbar(safeSto)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
- switch(obj.event) {
+ switch (obj.event) {
case 'add':
showEditModel();
break;
case 'exportData':
- layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
- window.location.href = baseUrl + '/safeSto/excel/export/auth?token='+localStorage.getItem('token');
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function () {
+ window.location.href = baseUrl + '/safeSto/excel/export/auth?token=' + localStorage.getItem('token');
layer.closeAll();
});
break;
@@ -75,7 +77,7 @@
});
// 鐩戝惉琛屽伐鍏蜂簨浠�
- table.on('tool(safeSto)', function(obj){
+ table.on('tool(safeSto)', function (obj) {
var data = obj.data;
switch (obj.event) {
// 淇敼
@@ -94,26 +96,26 @@
break;
// 琛ヤ粨
case 'allot':
- layer.confirm(data.node_name +'琛ヤ粨 '+ data.matnr + '锛屾暟閲忥細' + (data.safe_qua - data.amount), function(){
- var index = layer.load(1, {shade: [0.1,'#000']});
+ layer.confirm(data.node_name + '琛ヤ粨 ' + data.matnr + '锛屾暟閲忥細' + (data.safe_qua - data.amount), function () {
+ var index = layer.load(1, {shade: [0.1, '#000']});
$.ajax({
- url: baseUrl+"/work/stock/transfer",
+ url: baseUrl + "/work/stock/transfer",
headers: {'token': localStorage.getItem('token')},
- contentType:'application/json;charset=UTF-8',
+ contentType: 'application/json;charset=UTF-8',
data: JSON.stringify({
node_id: data.node_id,
matnr: data.matnr,
safe_qua: data.safe_qua,
amount: data.amount
}),
- dataType:'json',
+ dataType: 'json',
method: 'POST',
success: function (res) {
if (res.code === 200) {
layer.msg(res.msg, {icon: 1})
$(".layui-laypage-btn")[0].click();
} else if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
} else {
layer.msg(res.msg, {icon: 2})
}
@@ -141,20 +143,20 @@
data.field.matId = matXmSelect.getValue()[0] ? matXmSelect.getValue()[0].value : null;
var loadIndex = layer.load(2);
$.ajax({
- url: baseUrl+"/safeSto/"+(mData?'update':'add')+"/auth",
+ url: baseUrl + "/safeSto/" + (mData ? 'update' : 'add') + "/auth",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify(data.field),
- contentType:'application/json;charset=UTF-8',
+ contentType: 'application/json;charset=UTF-8',
method: 'POST',
success: function (res) {
layer.close(loadIndex);
- if (res.code === 200){
+ if (res.code === 200) {
layer.close(dIndex);
layer.msg(res.msg, {icon: 1});
tableReload();
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
layer.msg(res.msg, {icon: 2});
}
}
@@ -166,23 +168,23 @@
el: '#locNo',
radio: true,
autoRow: true,
- toolbar: { show: true },
+ toolbar: {show: true},
filterable: true,
remoteSearch: true,
- remoteMethod: function(val, cb, show){
+ remoteMethod: function (val, cb, show) {
//杩欓噷濡傛灉val涓虹┖, 鍒欎笉瑙﹀彂鎼滅储
// if(!val){
// return cb([]);
// }
$.ajax({
- url: baseUrl+"/locMast/all/get/kv",
+ url: baseUrl + "/locMast/all/get/kv",
headers: {'token': localStorage.getItem('token')},
data: {
condition: val
},
method: 'POST',
success: function (res) {
- if (res.code === 200){
+ if (res.code === 200) {
cb(res.data)
} else {
cb([]);
@@ -197,23 +199,23 @@
el: '#mat',
radio: true,
autoRow: true,
- toolbar: { show: true },
+ toolbar: {show: true},
filterable: true,
remoteSearch: true,
- remoteMethod: function(val, cb, show){
+ remoteMethod: function (val, cb, show) {
//杩欓噷濡傛灉val涓虹┖, 鍒欎笉瑙﹀彂鎼滅储
// if(!val){
// return cb([]);
// }
$.ajax({
- url: baseUrl+"/mat/all/get/kv",
+ url: baseUrl + "/mat/all/get/kv",
headers: {'token': localStorage.getItem('token')},
data: {
condition: val
},
method: 'POST',
success: function (res) {
- if (res.code === 200){
+ if (res.code === 200) {
cb(res.data)
} else {
cb([]);
@@ -240,18 +242,18 @@
layer.close(i);
var loadIndex = layer.load(2);
$.ajax({
- url: baseUrl+"/safeSto/delete/auth",
+ url: baseUrl + "/safeSto/delete/auth",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify(params),
- contentType:'application/json;charset=UTF-8',
+ contentType: 'application/json;charset=UTF-8',
method: 'POST',
success: function (res) {
layer.close(loadIndex);
- if (res.code === 200){
+ if (res.code === 200) {
layer.msg(res.msg, {icon: 1});
$(".layui-laypage-btn")[0].click();
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
} else {
layer.msg(res.msg, {icon: 2});
}
@@ -287,13 +289,13 @@
});
// 鍏抽棴鍔ㄤ綔
-$(document).on('click','#data-detail-close', function () {
+$(document).on('click', '#data-detail-close', function () {
parent.layer.closeAll();
});
function tableReload() {
var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
+ $.each($('#search-box [name]').serializeArray(), function () {
searchData[this.name] = this.value;
});
tableIns.reload({
@@ -305,9 +307,65 @@
}
-
$('body').keydown(function () {
if (event.keyCode === 13) {
$("#search").click();
}
});
+
+// excel瀵煎叆妯℃澘涓嬭浇
+function downloadData() {
+ layer.load(1, {shade: [0.1, '#fff']});
+ location.href = baseUrl + "/safeSto/excel/import/mould";
+ layer.closeAll('loading');
+}
+
+// excel瀵煎叆
+function importData() {
+ $("#btn-import").trigger("click");
+}
+
+function upload(obj) {
+ if (!obj.files) {
+ return;
+ }
+ var file = obj.files[0];
+ admin.confirm('纭鍚屾 [' + file.name + '] 鏂囦欢鍚楋紵', function (index) {
+ layer.load(1, {shade: [0.1, '#fff']});
+ var url = baseUrl + "/safeSto/excel/import/auth";
+ var form = new FormData();
+ form.append("file", file);
+ xhr = new XMLHttpRequest();
+ xhr.open("post", url, true); //post鏂瑰紡锛寀rl涓烘湇鍔″櫒璇锋眰鍦板潃锛宼rue 璇ュ弬鏁拌瀹氳姹傛槸鍚﹀紓姝ュ鐞嗐��
+ xhr.setRequestHeader('token', localStorage.getItem('token'));
+ xhr.onload = uploadComplete; //璇锋眰瀹屾垚
+ xhr.onerror = uploadFailed; //璇锋眰澶辫触
+ xhr.onloadend = function () { // // 涓婁紶瀹屾垚閲嶇疆鏂囦欢娴�
+ layer.closeAll('loading');
+ $("#importExcel").val("");
+ };
+ // xhr.upload.onprogress = progressFunction;//銆愪笂浼犺繘搴﹁皟鐢ㄦ柟娉曞疄鐜般��
+ xhr.upload.onloadstart = function () {//涓婁紶寮�濮嬫墽琛屾柟娉�
+ ot = new Date().getTime(); //璁剧疆涓婁紶寮�濮嬫椂闂�
+ oloaded = 0;//璁剧疆涓婁紶寮�濮嬫椂锛屼互涓婁紶鐨勬枃浠跺ぇ灏忎负0
+ };
+ xhr.send(form);
+ }, function (index) {
+ $("#btn-import").val("");
+ });
+}
+
+function uploadComplete(evt) {
+ var res = JSON.parse(evt.target.responseText);
+ if(res.code === 200) {
+ layer.msg(res.msg, {icon: 1});
+ loadTree("");
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+}
+
+function uploadFailed(evt) {
+ var res = JSON.parse(evt.target.responseText);
+ layer.msg(res.msg, {icon: 2});
+}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/waitPakin/waitPakin.js b/zy-asrs-wms/src/main/webapp/static/js/waitPakin/waitPakin.js
index 13409da..42c3ad3 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/waitPakin/waitPakin.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/waitPakin/waitPakin.js
@@ -9,14 +9,15 @@
html += ">";
return html;
}, hide: true}
+ ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
,{field: 'ioStatus', align: 'center',title: '鍏ュ嚭鐘舵��', templet:function(row){
var html = "<input value='ioStatus' type='checkbox' lay-skin='switch' lay-text='鍏ュ簱涓瓅寰呭叆搴�' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
if(row.ioStatus === 'Y'){html += " checked ";}
html += ">";
return html;
}}
- ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true})
+ )
return cols;
}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/wrkMast/wrkMast.js b/zy-asrs-wms/src/main/webapp/static/js/wrkMast/wrkMast.js
index a84a64a..47094ec 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -25,12 +25,12 @@
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿',sort: true, width: 160}
,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�'}
- ,{field: 'ioPri', align: 'center',title: '浼樺厛绾�'}
+ ,{field: 'ioPri', align: 'center',title: '浼樺厛绾�',sort: true}
,{field: 'sourceStaNo', align: 'center',title: '婧愮珯'}
,{field: 'staNo', align: 'center',title: '鐩爣绔�'}
,{field: 'sourceLocNo', align: 'center',title: '婧愬簱浣�'}
,{field: 'locNo', align: 'center',title: '鐩爣搴撲綅'}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜'}
+ ,{field: 'barcode', align: 'center',title: '鎵樼洏鐮�'}
,{field: 'preHave', align: 'center',title: '鍏堝叆鍝�', hide: true}
,{field: 'takeNone', align: 'center',title: '绌烘搷浣�', hide: true}
// ,{field: 'picking', align: 'center',title: '鎷ｆ枡', templet:function(row){
@@ -134,7 +134,8 @@
list.push({
wrkNo: track.wrkNo,
ioTime: track.ioTime,
- ioPri: track.ioPri
+ ioPri: track.ioPri,
+ id: track.id
});
});
$.ajax({
diff --git a/zy-asrs-wms/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js b/zy-asrs-wms/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
index fb342ac..f6ddbab 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
@@ -59,7 +59,7 @@
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true}
// ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'cursor:pointer'}
// ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜'}
+ ,{field: 'barcode', align: 'center',title: '鎵樼洏鐮�'}
// ,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
// var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
// if(row.fullPlt === 'Y'){html += " checked ";}
diff --git a/zy-asrs-wms/src/main/webapp/views/locDetl/locDetl.html b/zy-asrs-wms/src/main/webapp/views/locDetl/locDetl.html
index 4467d8a..0ecc6dd 100644
--- a/zy-asrs-wms/src/main/webapp/views/locDetl/locDetl.html
+++ b/zy-asrs-wms/src/main/webapp/views/locDetl/locDetl.html
@@ -83,7 +83,7 @@
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/locDetl/locDetl.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/locDetl/locDetl.js?v=1" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
diff --git a/zy-asrs-wms/src/main/webapp/views/locDetlStatis/locDetlStatis.html b/zy-asrs-wms/src/main/webapp/views/locDetlStatis/locDetlStatis.html
index a312e9c..a8c0743 100644
--- a/zy-asrs-wms/src/main/webapp/views/locDetlStatis/locDetlStatis.html
+++ b/zy-asrs-wms/src/main/webapp/views/locDetlStatis/locDetlStatis.html
@@ -19,6 +19,11 @@
<input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="maktx" placeholder="鍚嶇О" autocomplete="off">
+ </div>
+ </div>
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储
diff --git a/zy-asrs-wms/src/main/webapp/views/matCode/matCode.html b/zy-asrs-wms/src/main/webapp/views/matCode/matCode.html
index 88dd9a0..ca63a6f 100644
--- a/zy-asrs-wms/src/main/webapp/views/matCode/matCode.html
+++ b/zy-asrs-wms/src/main/webapp/views/matCode/matCode.html
@@ -74,7 +74,7 @@
</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 class="layui-input" name="barcode" placeholder="璇疯緭鍏ユ潯鐮�">
</div>
diff --git a/zy-asrs-wms/src/main/webapp/views/orderDetl/orderDetl.html b/zy-asrs-wms/src/main/webapp/views/orderDetl/orderDetl.html
index 638b995..fc71d1d 100644
--- a/zy-asrs-wms/src/main/webapp/views/orderDetl/orderDetl.html
+++ b/zy-asrs-wms/src/main/webapp/views/orderDetl/orderDetl.html
@@ -164,7 +164,7 @@
</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 class="layui-input" name="barcode" placeholder="璇疯緭鍏ユ潯鐮�">
</div>
diff --git a/zy-asrs-wms/src/main/webapp/views/pakStore/matQuery.html b/zy-asrs-wms/src/main/webapp/views/pakStore/matQuery.html
index 6f5f03d..8b10c85 100644
--- a/zy-asrs-wms/src/main/webapp/views/pakStore/matQuery.html
+++ b/zy-asrs-wms/src/main/webapp/views/pakStore/matQuery.html
@@ -48,11 +48,11 @@
<!-- <input class="layui-input" type="text" name="owner$" placeholder="鎷ユ湁鑰�" autocomplete="off">-->
<!-- </div>-->
<!-- </div>-->
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="maktx" placeholder="鍚嶇О" autocomplete="off">
- </div>
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="maktx" placeholder="鍚嶇О" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
<!-- 鏃ユ湡鑼冨洿 -->
<div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
diff --git a/zy-asrs-wms/src/main/webapp/views/prior/prior.html b/zy-asrs-wms/src/main/webapp/views/prior/prior.html
index 0c2f378..dce1378 100644
--- a/zy-asrs-wms/src/main/webapp/views/prior/prior.html
+++ b/zy-asrs-wms/src/main/webapp/views/prior/prior.html
@@ -128,7 +128,7 @@
</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 class="layui-input" name="barcode" placeholder="璇疯緭鍏ユ潯鐮�">
</div>
diff --git a/zy-asrs-wms/src/main/webapp/views/safeSto/safeSto.html b/zy-asrs-wms/src/main/webapp/views/safeSto/safeSto.html
index 1b43cf8..bf1ec97 100644
--- a/zy-asrs-wms/src/main/webapp/views/safeSto/safeSto.html
+++ b/zy-asrs-wms/src/main/webapp/views/safeSto/safeSto.html
@@ -54,6 +54,8 @@
<div class="layui-btn-container">
<button class="layui-btn layui-btn-sm" id="btn-add1" lay-event="add"><i class="layui-icon"></i>娣诲姞</button>
<button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <input class="layui-btn layui-btn-primary layui-btn-sm" id="btn-import" type="file" onchange="upload(this)" title="瀵煎叆">
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-download" onclick="downloadData()" >妯℃澘涓嬭浇</button>
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
</div>
</script>
@@ -84,7 +86,7 @@
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/safeSto/safeSto.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/safeSto/safeSto.js?v=4" charset="utf-8"></script>
<!-- 琛ㄥ崟寮圭獥 -->
<script type="text/html" id="editDialog">
diff --git a/zy-asrs-wms/src/main/webapp/views/waitPakin/waitPakin.html b/zy-asrs-wms/src/main/webapp/views/waitPakin/waitPakin.html
index 8944d0a..d67696b 100644
--- a/zy-asrs-wms/src/main/webapp/views/waitPakin/waitPakin.html
+++ b/zy-asrs-wms/src/main/webapp/views/waitPakin/waitPakin.html
@@ -25,6 +25,11 @@
<input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="owner" placeholder="璐т富" autocomplete="off">
+ </div>
+ </div>
<!-- 鏃ユ湡鑼冨洿 -->
<div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
@@ -79,7 +84,7 @@
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/waitPakin/waitPakin.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/waitPakin/waitPakin.js?v=2" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
diff --git a/zy-asrs-wms/src/main/webapp/views/waitPakinLog/waitPakinLog.html b/zy-asrs-wms/src/main/webapp/views/waitPakinLog/waitPakinLog.html
index 72b13f8..8de8c2e 100644
--- a/zy-asrs-wms/src/main/webapp/views/waitPakinLog/waitPakinLog.html
+++ b/zy-asrs-wms/src/main/webapp/views/waitPakinLog/waitPakinLog.html
@@ -19,6 +19,16 @@
<input class="layui-input" type="text" name="pakin_id" placeholder="鍏ュ簱閫氱煡鍙�" autocomplete="off">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="zpallet" placeholder="鎵樼洏鐮�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="matnr" placeholder="鍝佸彿" autocomplete="off">
+ </div>
+ </div>
<!-- 鏃ユ湡鑼冨洿 -->
<div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
diff --git a/zy-asrs-wms/src/main/webapp/views/wrkDetl/wrkDetl.html b/zy-asrs-wms/src/main/webapp/views/wrkDetl/wrkDetl.html
index 1902578..52ec264 100644
--- a/zy-asrs-wms/src/main/webapp/views/wrkDetl/wrkDetl.html
+++ b/zy-asrs-wms/src/main/webapp/views/wrkDetl/wrkDetl.html
@@ -36,6 +36,16 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
+ <input class="layui-input" type="text" name="zpallet" placeholder="鎵樼洏鐮�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="orderNo" placeholder="鍗曟嵁" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
<input class="layui-input" type="text" name="owner" placeholder="鎷ユ湁鑰呯紪鍙�" autocomplete="off">
</div>
</div>
@@ -75,7 +85,7 @@
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/wrkDetl/wrkDetl.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/wrkDetl/wrkDetl.js?v=1" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
diff --git a/zy-asrs-wms/src/main/webapp/views/wrkMast/wrkMast.html b/zy-asrs-wms/src/main/webapp/views/wrkMast/wrkMast.html
index 4a2a3ab..0afb61e 100644
--- a/zy-asrs-wms/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/zy-asrs-wms/src/main/webapp/views/wrkMast/wrkMast.html
@@ -132,7 +132,7 @@
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/wrkMast/wrkMast.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/wrkMast/wrkMast.js?v=1" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
diff --git a/zy-asrs-wms/src/main/webapp/views/wrkMastLog/wrkMastLog.html b/zy-asrs-wms/src/main/webapp/views/wrkMastLog/wrkMastLog.html
index 7282b31..5b2978d 100644
--- a/zy-asrs-wms/src/main/webapp/views/wrkMastLog/wrkMastLog.html
+++ b/zy-asrs-wms/src/main/webapp/views/wrkMastLog/wrkMastLog.html
@@ -24,6 +24,11 @@
</div>
</div>
<div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="barcode" placeholder="鎵樼洏鐮�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
<div class="layui-input-inline cool-auto-complete">
<input id="wrkSts" class="layui-input" name="wrk_sts" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
<input id="wrkSts$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="宸ヤ綔鐘舵��" onfocus=this.blur()>
@@ -94,7 +99,7 @@
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/wrkMastLog/wrkMastLog.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/wrkMastLog/wrkMastLog.js?v=1" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
--
Gitblit v1.9.1