From 05ebcccc2c8099c0252501fea0e1797e5a1361d2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 15 七月 2020 10:59:46 +0800
Subject: [PATCH] Merge branches 'master' and 'xtyasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xtyasrs
---
src/main/webapp/static/js/report/stayTime.js | 4
src/main/webapp/views/locDetl/locDetl.html | 5 -
src/main/java/com/zy/asrs/utils/VersionUtils.java | 51 ++++++++++++
src/main/webapp/static/js/report/reportStockUse.js | 4
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 49 ++---------
src/main/webapp/static/js/stkPlcm/stkPlcm.js | 4
src/main/java/com/zy/asrs/entity/MatCode.java | 6
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 7 -
src/main/webapp/static/js/report/workIn.js | 4
src/main/webapp/views/matCode/matCode_detail.html | 14 +-
src/main/webapp/static/css/common.css | 12 +-
src/main/webapp/static/js/locDetl/locDetl.js | 4
src/main/webapp/static/js/report/workOut.js | 4
src/main/webapp/static/js/report/inOut.js | 4
src/main/java/com/zy/asrs/entity/LocDetl.java | 4
src/main/webapp/static/js/wrkMastLog/wrkMastLog.js | 4
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 33 +-------
src/main/webapp/static/js/matCode/matCode.js | 3
src/main/java/com/zy/asrs/entity/WrkDetl.java | 4
src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js | 4
src/main/webapp/static/js/errorWrkMast/errorWrkMast.js | 4
src/main/webapp/static/js/waitPakinLog/waitPakinLog.js | 4
src/main/resources/application.yml | 2
23 files changed, 114 insertions(+), 120 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 8be72f5..96e715d 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -38,7 +38,7 @@
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "浠撳簱鍙�")
+ @ApiModelProperty(value= "瑙勬牸")
private String lgnum;
/**
@@ -56,7 +56,7 @@
/**
* 鐗╂枡鏍囩ID
*/
- @ApiModelProperty(value= "鐗╂枡鏍囩ID")
+ @ApiModelProperty(value= "棰滆壊")
private String zmatid;
/**
diff --git a/src/main/java/com/zy/asrs/entity/MatCode.java b/src/main/java/com/zy/asrs/entity/MatCode.java
index bfa7e5d..10d2feb 100644
--- a/src/main/java/com/zy/asrs/entity/MatCode.java
+++ b/src/main/java/com/zy/asrs/entity/MatCode.java
@@ -52,10 +52,10 @@
@ApiModelProperty(value= "鐗╂枡瑙勬牸")
private String str2;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "棰滆壊")
private String str3;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "瀹㈡埛")
private String str4;
@ApiModelProperty(value= "")
@@ -115,7 +115,7 @@
@ApiModelProperty(value= "")
private String str23;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "閲嶉噺")
private Double num1;
@ApiModelProperty(value= "")
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 58cbe5b..db9451b 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -40,7 +40,7 @@
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "浠撳簱鍙�")
+ @ApiModelProperty(value= "瑙勬牸")
private String lgnum;
/**
@@ -58,7 +58,7 @@
/**
* 鐗╂枡鏍囩ID
*/
- @ApiModelProperty(value= "鐗╂枡鏍囩ID")
+ @ApiModelProperty(value= "棰滆壊")
private String zmatid;
/**
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index c3e32e1..048d893 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -11,6 +11,7 @@
import com.zy.asrs.entity.param.LocDetlAdjustParam;
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.*;
+import com.zy.asrs.utils.VersionUtils;
import com.zy.common.model.LocDetlDto;
import com.zy.common.model.OutLocDto;
import com.zy.common.model.StartupDto;
@@ -52,8 +53,6 @@
private AdjDetlService adjDetlService;
@Autowired
private WrkMastLogService wrkMastLogService;
- @Autowired
- private WrkDetlLogService wrkDetlLogService;
@Override
@Transactional
@@ -215,16 +214,9 @@
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.setWrkNo(workNo);
wrkDetl.setIoTime(new Date());
- wrkDetl.setMatnr(detlDto.getLocDetl().getMatnr());
Double anfme = ioType==101?detlDto.getCount():detlDto.getLocDetl().getAnfme();
wrkDetl.setAnfme(anfme); // 鏁伴噺
- wrkDetl.setZmatid(detlDto.getLocDetl().getZmatid());
- wrkDetl.setTbpos(detlDto.getLocDetl().getTbpos());
- wrkDetl.setTbnum(detlDto.getLocDetl().getTbnum());
- wrkDetl.setLgnum(detlDto.getLocDetl().getLgnum());
- wrkDetl.setAltme(detlDto.getLocDetl().getAltme());
- wrkDetl.setBname(detlDto.getLocDetl().getBname());
- wrkDetl.setMaktx(detlDto.getLocDetl().getMaktx());
+ VersionUtils.setWrkDetl(wrkDetl, detlDto.getLocDetl()); // 鐗堟湰鎺у埗
wrkDetl.setAppeTime(new Date());
wrkDetl.setAppeUser(userId);
wrkDetl.setModiTime(new Date());
@@ -420,6 +412,7 @@
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk(sourceLoc.getLocType().equals("D")?"Y":"N"); // 绌烘澘
+ wrkMast.setBarcode(sourceLoc.getBarcode()); // 鎵樼洏鐮�
wrkMast.setLinkMis("N");
wrkMast.setAppeUser(userId);
wrkMast.setAppeTime(new Date());
@@ -435,15 +428,8 @@
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.setWrkNo(workNo);
wrkDetl.setIoTime(new Date());
- wrkDetl.setMatnr(locDetl.getMatnr());
wrkDetl.setAnfme(locDetl.getAnfme());
- wrkDetl.setZmatid(locDetl.getZmatid());
- wrkDetl.setTbpos(locDetl.getTbpos());
- wrkDetl.setTbnum(locDetl.getTbnum());
- wrkDetl.setLgnum(locDetl.getLgnum());
- wrkDetl.setAltme(locDetl.getAltme());
- wrkDetl.setBname(locDetl.getBname());
- wrkDetl.setMaktx(locDetl.getMaktx());
+ VersionUtils.setWrkDetl(wrkDetl, locDetl); // 鐗堟湰鎺у埗
wrkDetl.setAppeTime(new Date());
wrkDetl.setAppeUser(userId);
wrkDetl.setModiTime(new Date());
@@ -523,17 +509,8 @@
MatCode matCode = matCodeService.selectById(adjust.getMatnr());
LocDetl locDetl = new LocDetl();
locDetl.setLocNo(locMast.getLocNo());
- locDetl.setMatnr(matCode.getMatNo());
- locDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
locDetl.setAnfme(adjust.getCount()); // 鏁伴噺
- locDetl.setAltme(matCode.getStr1()); // 鍗曚綅
- // todo:luxiaoao
- locDetl.setLgnum("寰呭畾"); // 浠撳簱鍙�
- locDetl.setTbnum(0); // 杞偍璇锋眰缂栧彿
- locDetl.setTbpos(0); // 琛岄」鐩�
- locDetl.setZmatid("寰呭畾"); // 鐗╂枡鏍囩ID
- locDetl.setZpallet("寰呭畾"); // 鎵樼洏鏉＄爜
-
+ VersionUtils.setLocDetl(locDetl, matCode); // 鐗堟湰鎺у埗
locDetl.setModiUser(userId); // 鎿嶄綔浜哄憳淇℃伅
locDetl.setModiTime(new Date());
locDetl.setAppeUser(userId);
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
index fe31337..0273900 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -9,6 +9,7 @@
import com.zy.asrs.mapper.WrkDetlMapper;
import com.zy.asrs.service.MatCodeService;
import com.zy.asrs.service.WrkDetlService;
+import com.zy.asrs.utils.VersionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -37,13 +38,9 @@
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.setWrkNo(workNo);
wrkDetl.setIoTime(new Date());
- wrkDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
wrkDetl.setAnfme(dto.getCount()); // 鏁伴噺
+ VersionUtils.setWrkDetl(wrkDetl, matCode); // 鐗堟湰鎺у埗
wrkDetl.setZpallet(barcode); // 鎵樼洏鏉＄爜
- wrkDetl.setLgnum("寰呭畾"); // todo
- wrkDetl.setTbnum(0); // todo
- wrkDetl.setTbpos(0); // todo
- wrkDetl.setZmatid("寰呭畾"); // todo
wrkDetl.setAppeUser(userId);
wrkDetl.setAppeTime(new Date());
wrkDetl.setModiUser(userId);
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index e6c949d..d1c0950 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -5,6 +5,7 @@
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.utils.VersionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -83,25 +84,11 @@
exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
}
} else {
- locDetl = new LocDetl(
- wrkMast.getLocNo(), // 搴撲綅鍙�
- wrkDetl.getMatnr(), // 鐗╂枡鍙�
- null, // 浠撳簱鍙�
- null, // 杞偍璇锋眰缂栧彿
- null, // 琛岄」鐩�
- null, // 鐗╂枡鏍囩ID
- wrkDetl.getMaktx(), // 鐗╂枡鎻忚堪
- null, // 宸ュ巶
- wrkDetl.getAnfme(), // 鏁伴噺
- wrkDetl.getAltme(), // 鍗曚綅
- wrkDetl.getZpallet(), // 鎵樼洏鏉＄爜
- null, // 鐢ㄦ埛ID
- null, // 澶囨敞
- null, // 淇敼浜哄憳
- now, // 淇敼鏃堕棿
- null, // 鍒涘缓鑰�
- now // 娣诲姞鏃堕棿
- );
+ locDetl = new LocDetl();
+ locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
+ VersionUtils.setLocDetl(locDetl, wrkDetl); // 鐗堟湰鎺у埗
+ locDetl.setModiTime(now);
+ locDetl.setAppeTime(now);
if (!locDetlService.insert(locDetl)) {
exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
}
@@ -171,25 +158,11 @@
exceptionHandle("骞舵澘鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触锛沎workNo={0}],[matnr={1}]", wrkMast.getWrkNo(), wrkDetl.getMatnr());
}
} else {
- locDetl = new LocDetl(
- wrkMast.getLocNo(), // 搴撲綅鍙�
- wrkDetl.getMatnr(), // 鐗╂枡鍙�
- null, // 浠撳簱鍙�
- null, // 杞偍璇锋眰缂栧彿
- null, // 琛岄」鐩�
- null, // 鐗╂枡鏍囩ID
- wrkDetl.getMaktx(), // 鐗╂枡鎻忚堪
- null, // 宸ュ巶
- wrkDetl.getAnfme(), // 鏁伴噺
- wrkDetl.getAltme(), // 鍗曚綅
- wrkDetl.getZpallet(), // 鎵樼洏鏉＄爜
- null, // 鐢ㄦ埛ID
- null, // 澶囨敞
- null, // 淇敼浜哄憳
- now, // 淇敼鏃堕棿
- null, // 鍒涘缓鑰�
- now // 娣诲姞鏃堕棿
- );
+ locDetl = new LocDetl();
+ locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
+ VersionUtils.setLocDetl(locDetl, wrkDetl); // 鐗堟湰鎺у埗
+ locDetl.setModiTime(now);
+ locDetl.setAppeTime(now);
if (!locDetlService.insert(locDetl)) {
exceptionHandle("骞舵澘鍏ュ簱 ===>> 鏂板搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[matnr={1}]", wrkMast.getWrkNo(), wrkDetl.getMatnr());
}
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
new file mode 100644
index 0000000..21a5ed9
--- /dev/null
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -0,0 +1,51 @@
+package com.zy.asrs.utils;
+
+import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.MatCode;
+import com.zy.asrs.entity.WrkDetl;
+
+/**
+ * Created by vincent on 2020/7/14
+ */
+public class VersionUtils {
+
+ public static void setWrkDetl(WrkDetl wrkDetl, MatCode matCode) {
+ wrkDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
+ wrkDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
+ wrkDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
+ wrkDetl.setZmatid(matCode.getStr3()); // 棰滆壊
+ wrkDetl.setAltme(matCode.getStr1()); // 鍗曚綅
+ wrkDetl.setBname(matCode.getStr4()); // 鐢ㄦ埛ID
+ }
+
+ public static void setWrkDetl(WrkDetl wrkDetl, LocDetl locDetl) {
+ wrkDetl.setMatnr(locDetl.getMatnr()); // 鐗╂枡缂栧彿
+ wrkDetl.setMaktx(locDetl.getMaktx()); // 鐗╂枡鎻忚堪
+ wrkDetl.setLgnum(locDetl.getLgnum()); // 瑙勬牸
+ wrkDetl.setZmatid(locDetl.getZmatid()); // 棰滆壊
+ wrkDetl.setAltme(locDetl.getAltme()); // 鍗曚綅
+ wrkDetl.setBname(locDetl.getBname()); // 鐢ㄦ埛ID
+ wrkDetl.setZpallet(locDetl.getZpallet()); // 鎵樼洏鏉＄爜
+ }
+
+ public static void setLocDetl(LocDetl locDetl, MatCode matCode) {
+ locDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
+ locDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
+ locDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
+ locDetl.setZmatid(matCode.getStr3()); // 棰滆壊
+ locDetl.setAltme(matCode.getStr1()); // 鍗曚綅
+ locDetl.setBname(matCode.getStr4()); // 鐢ㄦ埛ID
+ }
+
+ public static void setLocDetl(LocDetl locDetl, WrkDetl wrkDetl) {
+ locDetl.setMatnr(wrkDetl.getMatnr()); // 鐗╂枡缂栧彿
+ locDetl.setMaktx(wrkDetl.getMaktx()); // 鐗╂枡鎻忚堪
+ locDetl.setLgnum(wrkDetl.getLgnum()); // 瑙勬牸
+ locDetl.setZmatid(wrkDetl.getZmatid()); // 棰滆壊
+ locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
+ locDetl.setAltme(wrkDetl.getAltme()); // 鍗曚綅
+ locDetl.setBname(wrkDetl.getBname()); // 鐢ㄦ埛ID
+ locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
+ }
+
+}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 12eaea8..a3210c4 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -13,7 +13,7 @@
# password: xltys1995
# sql-server
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=xtyasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=dlasrs
username: sa
password: sa@123
mvc:
diff --git a/src/main/webapp/static/css/common.css b/src/main/webapp/static/css/common.css
index af20387..db9f679 100644
--- a/src/main/webapp/static/css/common.css
+++ b/src/main/webapp/static/css/common.css
@@ -1,9 +1,9 @@
-*, *::before, *::after {
- -webkit-box-sizing: border-box;
- box-sizing: border-box;
- margin: 0;
- padding: 0;
-}
+/**, *::before, *::after {*/
+/* -webkit-box-sizing: border-box;*/
+/* box-sizing: border-box;*/
+/* margin: 0;*/
+/* padding: 0;*/
+/*}*/
body {
background-color: #fff;
diff --git a/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js b/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js
index 7feb380..973996c 100644
--- a/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js
+++ b/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js
@@ -20,8 +20,8 @@
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {type: 'checkbox'}
- ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',sort: true}
+ // {type: 'checkbox'}
+ {field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',sort: true}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿',sort: true, hide:true}
,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�'}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 27fb1c1..e2929a8 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -18,9 +18,9 @@
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {type: 'checkbox'}
+ // {type: 'checkbox'}
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
- ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+ {field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
,{field: 'matnr', align: 'center',title: '鐗╂枡'}
// ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�', width:80}
// ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
diff --git a/src/main/webapp/static/js/matCode/matCode.js b/src/main/webapp/static/js/matCode/matCode.js
index 5cab270..1d2861f 100644
--- a/src/main/webapp/static/js/matCode/matCode.js
+++ b/src/main/webapp/static/js/matCode/matCode.js
@@ -60,8 +60,7 @@
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
// ,{field: 'status', align: 'center',title: ''}
-
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
request: {
pageName: 'curr',
diff --git a/src/main/webapp/static/js/report/inOut.js b/src/main/webapp/static/js/report/inOut.js
index 42224dc..e7dff96 100644
--- a/src/main/webapp/static/js/report/inOut.js
+++ b/src/main/webapp/static/js/report/inOut.js
@@ -17,8 +17,8 @@
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {type: 'checkbox'}
- ,{field: 'ymd', align: 'center', title: '鏃ユ湡'}
+ // {type: 'checkbox'}
+ {field: 'ymd', align: 'center', title: '鏃ユ湡'}
,{field: 'source_sta_no', align: 'center',title: '绔欑偣'}
,{field: 'sto_qty', align: 'center',title: '鍏ュ簱娆℃暟'}
,{field: 'ret_qty', align: 'center',title: '鍑哄簱娆℃暟'}
diff --git a/src/main/webapp/static/js/report/reportStockUse.js b/src/main/webapp/static/js/report/reportStockUse.js
index 11e0465..414dde2 100644
--- a/src/main/webapp/static/js/report/reportStockUse.js
+++ b/src/main/webapp/static/js/report/reportStockUse.js
@@ -18,8 +18,8 @@
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {type: 'checkbox', fixed: 'left'}
- ,{field: 'row1', title: '閽㈡灦鍙�', sort: true, align: 'center'}
+ // {type: 'checkbox', fixed: 'left'}
+ {field: 'row1', title: '閽㈡灦鍙�', sort: true, align: 'center'}
,{field: 'total_qty', align: 'center',title: '搴撲綅鎬绘暟'}
,{field: 'full_qty', align: 'center',title: '鍦ㄥ簱鏁伴噺'}
,{field: 'null_qty', align: 'center',title: '绌哄簱浣嶆暟閲�'}
diff --git a/src/main/webapp/static/js/report/stayTime.js b/src/main/webapp/static/js/report/stayTime.js
index 5947366..961fe31 100644
--- a/src/main/webapp/static/js/report/stayTime.js
+++ b/src/main/webapp/static/js/report/stayTime.js
@@ -18,8 +18,8 @@
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {type: 'checkbox'}
- ,{field: 'appe_time', title: '鍏ュ簱鏃堕棿', align: 'center'}
+ // {type: 'checkbox'}
+ {field: 'appe_time', title: '鍏ュ簱鏃堕棿', align: 'center'}
,{field: 'stay_time', align: 'center',title: '婊炵暀澶╂暟'}
,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
,{field: 'matnr', align: 'center',title: '鐗╂枡'}
diff --git a/src/main/webapp/static/js/report/workIn.js b/src/main/webapp/static/js/report/workIn.js
index 13e3959..bedebe3 100644
--- a/src/main/webapp/static/js/report/workIn.js
+++ b/src/main/webapp/static/js/report/workIn.js
@@ -17,8 +17,8 @@
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {type: 'checkbox'}
- ,{field: 'io_time', align: 'center', title: '鍏ュ簱鏃ユ湡'}
+ // {type: 'checkbox'}
+ {field: 'io_time', align: 'center', title: '鍏ュ簱鏃ユ湡'}
,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
// ,{field: 'crn_str_time', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'}
// ,{field: 'crn_end_time', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
diff --git a/src/main/webapp/static/js/report/workOut.js b/src/main/webapp/static/js/report/workOut.js
index fc2f2d4..7ad1126 100644
--- a/src/main/webapp/static/js/report/workOut.js
+++ b/src/main/webapp/static/js/report/workOut.js
@@ -17,8 +17,8 @@
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {type: 'checkbox'}
- ,{field: 'io_time', align: 'center', title: '鍑哄簱鏃ユ湡'}
+ // {type: 'checkbox'}
+ {field: 'io_time', align: 'center', title: '鍑哄簱鏃ユ湡'}
,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
,{field: 'crn_str_time', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'}
,{field: 'crn_end_time', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
diff --git a/src/main/webapp/static/js/stkPlcm/stkPlcm.js b/src/main/webapp/static/js/stkPlcm/stkPlcm.js
index 6e70a8c..e9e1e00 100644
--- a/src/main/webapp/static/js/stkPlcm/stkPlcm.js
+++ b/src/main/webapp/static/js/stkPlcm/stkPlcm.js
@@ -17,8 +17,8 @@
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {type: 'checkbox'}
- ,{field: 'ioTime$', align: 'center',title: '鏃ユ湡'}
+ // {type: 'checkbox'}
+ {field: 'ioTime$', align: 'center',title: '鏃ユ湡'}
,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�',event: 'locNo', style: 'cursor:pointer'}
,{field: 'crnError$', align: 'center',title: '寮傚父鐮�'}
diff --git a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
index 4c5a625..0dd26b7 100644
--- a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
+++ b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
@@ -18,10 +18,10 @@
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {type: 'checkbox'}
+ // {type: 'checkbox'}
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
// ,{field: 'id', align: 'center',title: '缂栧彿'}
- ,{field: 'pakinId', align: 'center',title: '鍏ュ簱閫氱煡鍙�'}
+ {field: 'pakinId', align: 'center',title: '鍏ュ簱閫氱煡鍙�'}
,{field: 'barcode', align: 'center',title: '鎵樼洏鐮�'}
,{field: 'matnr', align: 'center',title: '鐗╂枡缂栫爜'}
,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'}
diff --git a/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js b/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js
index c4497e2..7d86086 100644
--- a/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js
+++ b/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js
@@ -18,9 +18,9 @@
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {type: 'checkbox'}
+ // {type: 'checkbox'}
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
- ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
+ {field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
,{field: 'matnr', align: 'center',title: '鐗╂枡缂栧彿'}
// ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
diff --git a/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
index 80d052e..5d0e30f 100644
--- a/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
+++ b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
@@ -18,10 +18,10 @@
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {type: 'checkbox'}
+ // {type: 'checkbox'}
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
// ,{field: 'id', align: 'center',title: '缂栧彿'}
- ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',event: 'wrkNo', sort: true}
+ {field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',event: 'wrkNo', sort: true}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿', width:160, sort: true}
,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��', width:160}
,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�', width:160}
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index ae77b87..44ad39d 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -37,15 +37,12 @@
</div>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
- <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="margin-top: 10px">瀵煎嚭</button>
</div>
</script>
<script type="text/html" id="operate">
<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>
- <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
diff --git a/src/main/webapp/views/matCode/matCode_detail.html b/src/main/webapp/views/matCode/matCode_detail.html
index b9b440c..146c560 100644
--- a/src/main/webapp/views/matCode/matCode_detail.html
+++ b/src/main/webapp/views/matCode/matCode_detail.html
@@ -15,14 +15,14 @@
<!-- 璇︽儏 -->
<div id="data-detail" class="layer_self_wrap">
<form id="detail" class="layui-form">
- <!--
- <div class="layui-inline" style="display: none">
- <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
- <div class="layui-input-inline">
- <input id="id" class="layui-input" type="text" placeholder="缂栧彿">
+ <!--
+ <div class="layui-inline" style="display: none">
+ <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="id" class="layui-input" type="text" placeholder="缂栧彿">
+ </div>
</div>
- </div>
- -->
+ -->
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label"><span class="not-null">*</span>鐗╂枡缂栫爜锛�</label>
<div class="layui-input-inline">
--
Gitblit v1.9.1