From 98ad8b1986704d39693ad61ba3f167013cd2fdf0 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期五, 26 一月 2024 18:40:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/OutboundAllocationUtil.java | 10 +-
src/main/webapp/static/js/wrkMastSta/wrkMastSta.js | 8
src/main/webapp/views/wrkMastSta/wrkMastSta.html | 92 ++++++++++++-----
src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java | 48 ++++++---
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 14 ++
src/main/resources/mapper/WrkMastMapper.xml | 4
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 6
src/main/java/com/zy/asrs/entity/param/TrussCombParam.java | 10 +-
src/main/java/com/zy/asrs/task/BareBoardScheduler.java | 4
src/main/java/com/zy/asrs/entity/WrkMastSta.java | 69 +++++++++++++
src/main/java/com/zy/asrs/service/WrkMastService.java | 1
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 5 +
src/main/java/com/zy/asrs/task/OneLouHangJiaScheduler.java | 16 ++
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 1
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 2
15 files changed, 226 insertions(+), 64 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastSta.java b/src/main/java/com/zy/asrs/entity/WrkMastSta.java
index a7bf27f..c5cfbe3 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastSta.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastSta.java
@@ -106,7 +106,7 @@
private Integer lineNumber;
/**
- * 宸ヤ綔绫诲瀷
+ * 宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
*/
@ApiModelProperty(value = "宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�")
@TableField("wrk_type")
@@ -212,5 +212,72 @@
}
}
+ public String getType$() {
+ if (Cools.isEmpty(this.type)) {
+ return "";
+ }
+ switch (this.type) {
+ case 1:
+ return "闈炵┖";
+ case 2:
+ return "绌烘澘";
+ default:
+ return "";
+ }
+ }
+
+ /**
+ * 宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氱瓑寰呭皬杞﹀彇 2锛氱瓑寰呭皬杞︽斁 3锛氬畬鎴�
+ */
+ public String getWrkSts$() {
+ if (Cools.isEmpty(this.wrkSts)) {
+ try {
+ if (this.wrkSts==0){
+ return "鍒濆";
+ }
+ }catch (Exception e){
+ return "";
+ }
+ return "";
+ }
+ switch (this.wrkSts) {
+ case 0:
+ return "鍒濆";
+ case 1:
+ return "绛夊緟灏忚溅鍙�";
+ case 2:
+ return "绛夊緟灏忚溅鏀�";
+ case 3:
+ return "瀹屾垚";
+ default:
+ return "";
+ }
+ }
+
+ /**
+ * 宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
+ */
+ public String getWrkType$() {
+ if (Cools.isEmpty(this.wrkType)) {
+ return "";
+ }
+ switch (this.wrkType) {
+ case 1:
+ return "鍙犵洏";
+ case 2:
+ return "鎷嗙洏";
+ case 3:
+ return "鍙栨斁";
+ case 4:
+ return "琛岃蛋";
+ case 5:
+ return "婊″彇";
+ case 6:
+ return "婊℃斁";
+ default:
+ return "";
+ }
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java b/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java
index 19c74cc..c7ae086 100644
--- a/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java
@@ -59,11 +59,11 @@
public TrussCombParam(){}
- public TrussCombParam( WrkDetl wrkDetl){
- this.barcode = wrkDetl.getBarcode();
+ public TrussCombParam( WrkDetl wrkDetl,Integer staEnd){
+ this.barcode = wrkDetl.getZpallet();
this.staStart = 147;
- this.palletizingNo2 = 118;
- this.staEnd = 118;
+ this.palletizingNo2 = staEnd;
+ this.staEnd = staEnd;
this.boxType = wrkDetl.getBrand();
this.uuid = wrkDetl.getBarcode();
this.orderNo = wrkDetl.getOrderNo();
@@ -74,7 +74,7 @@
matList.setAnfme(wrkDetl.getAnfme().intValue());
matList.setBatch(wrkDetl.getBatch());
matList.setBoxNo(wrkDetl.getBatch());
- matList.setPosition("1");
+ matList.setPosition(wrkDetl.getOrigin());
matList.setWeight(wrkDetl.getWeight());
matLists.add(matList);
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 47c07be..af2c105 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -14,6 +14,7 @@
// @Select("select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) and io_type <> 103 and io_type <> 104 and io_type <> 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no")
List<WrkMast> selectToBeCompleteData();
+ List<WrkMast> selectToBeCompleteData202();
List<WrkMast> selectToBeHistoryData();
diff --git a/src/main/java/com/zy/asrs/service/WrkMastService.java b/src/main/java/com/zy/asrs/service/WrkMastService.java
index debf331..dcd14ad 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastService.java
@@ -10,6 +10,7 @@
int getWorkingMast(Integer devpNo);
List<WrkMast> selectToBeCompleteData();
+ List<WrkMast> selectToBeCompleteData202();
List<WrkMast> selectToBeHistoryData();
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 3b58ed6..22c5437 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -301,7 +301,7 @@
waitPakin.setVolume(orderDetl.getVolume()); //姣涢噸
waitPakin.setPrice(orderDetl.getPrice()); //闀垮害
waitPakin.setSpecs(String.valueOf(orderDetl.getSpecs())); //鎺ュご
- waitPakin.setOrigin("2"); //鏈ㄧ鍦ㄦ墭鐩樹笂鐨勪綅缃�
+ waitPakin.setOrigin("1"); //鏈ㄧ鍦ㄦ墭鐩樹笂鐨勪綅缃�
waitPakin.setIoStatus("Y"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(orderDetl.getAnfme()); // 鏈ㄧ涓摐绠旀暟閲�
waitPakin.setWeight(orderDetl.getWeight()); // 鏈ㄧ涓摐绠斿噣閲�
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
index e522563..dd3be64 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -26,6 +26,11 @@
}
@Override
+ public List<WrkMast> selectToBeCompleteData202() {
+ return this.baseMapper.selectToBeCompleteData202();
+ }
+
+ @Override
public List<WrkMast> selectToBeHistoryData() {
return this.baseMapper.selectToBeHistoryData();
}
diff --git a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
index 19bb983..8a13a9c 100644
--- a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
+++ b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
@@ -53,7 +53,9 @@
boolean sign = true;
WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>()
.eq("type", 2).eq("wrk_sts", 0).eq("wrk_type", 2));
- if (Cools.isEmpty(wrkMastSta)){
+ WrkMastSta wrkMastSta2 = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>()
+ .eq("type", 2).eq("wrk_sts", 0).eq("wrk_type", 1));
+ if (Cools.isEmpty(wrkMastSta) || !Cools.isEmpty(wrkMastSta2)){
sign=false;
}
RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
diff --git a/src/main/java/com/zy/asrs/task/OneLouHangJiaScheduler.java b/src/main/java/com/zy/asrs/task/OneLouHangJiaScheduler.java
index c3f00db..923b229 100644
--- a/src/main/java/com/zy/asrs/task/OneLouHangJiaScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OneLouHangJiaScheduler.java
@@ -1,5 +1,9 @@
package com.zy.asrs.task;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.zy.asrs.entity.WrkMastSta;
+import com.zy.asrs.service.WrkMastStaService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.OneLouHangJiaHandler;
import com.zy.asrs.task.handler.RailwayPlatformHandler;
@@ -16,12 +20,20 @@
@Autowired
private OneLouHangJiaHandler oneLouHangJiaHandler;
+ @Autowired
+ private WrkMastStaService wrkMastStaService;
@Scheduled(cron = "0/3 * * * * ? ")
private void execute(){//閫�搴撴媶鐮佸灈
- int[] staNos =new int[]{147};
+// int[] staNos =new int[]{118,119};
+ int[] staNos =new int[]{118};
for (int staNo : staNos){
- ReturnT<String> result = oneLouHangJiaHandler.start(staNo);
+ WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("sta_end",staNo)
+ .eq("type", 2).eq("wrk_sts", 0).eq("wrk_type", 2));
+ if (!Cools.isEmpty(wrkMastSta)){
+ break;
+ }
+ ReturnT<String> result = oneLouHangJiaHandler.start(147,staNo);
if (result.getCode()==200){
break;
}
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index d4eb436..ab89d72 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -51,4 +51,18 @@
}
}
+ @Scheduled(cron = "0/3 * * * * ? ")
+ private void execute202(){
+ List<WrkMast> wrkMasts = wrkMastService.selectToBeCompleteData202();
+ if (wrkMasts.isEmpty()) {
+ return;
+ }
+ for (WrkMast wrkMast : wrkMasts) {
+ wrkMast.setWrkSts(57L);
+ if (!wrkMastService.updateById(wrkMast)) {
+ log.error("宸ヤ綔妗workNo={}]杞畬鎴愬鐞嗗け璐�", wrkMast.getWrkNo());
+ }
+ }
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java b/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java
index eeebaa6..1bdc492 100644
--- a/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java
@@ -57,8 +57,9 @@
@Value("${srHangJia.reportInPath}")
private String reportOutPath;
- public ReturnT<String> start(int staNo) {
+ public ReturnT<String> start(int staNo,int staNoEnd) {
try {
+ Integer staOther = getStaOther(staNoEnd);
BasDevp basDevp = basDevpService.selectById(staNo);
if (Cools.isEmpty(basDevp) || basDevp.getWrkNo()==0
|| !basDevp.getAutoing().equals("Y") || !basDevp.getLoading().equals("Y") || !basDevp.getInEnable().equals("Y")){
@@ -83,19 +84,18 @@
|| Cools.isEmpty(wrkDetl.getBrand())){
return FAIL;
}
- BasDevp basDevp118 = basDevpService.selectById(118);
- if (Cools.isEmpty(basDevp118) || !basDevp118.getAutoing().equals("Y") || basDevp118.getReportSign()!=0 ){
+ BasDevp basDevpEnd = basDevpService.selectById(staNoEnd);
+ if (Cools.isEmpty(basDevpEnd) || !basDevpEnd.getAutoing().equals("Y") || basDevpEnd.getReportSign()!=0 ){
return FAIL;
}
- BasDevp basDevp119 = basDevpService.selectById(119);
- if (Cools.isEmpty(basDevp119) || basDevp119.getReportSign()!=0){
+ BasDevp basDevpOther = basDevpService.selectById(staOther);
+ if (Cools.isEmpty(basDevpOther) || basDevpOther.getReportSign()!=0){
return FAIL;
}
- if (basDevp118.getLoading().equals("Y") && basDevp118.getEmptyMk().equals("Y")){
+ if (basDevpEnd.getLoading().equals("Y") && basDevpEnd.getEmptyMk().equals("Y")){
//鐢熸垚鏈烘鑷備换鍔�
-
- TrussCombParam trussCombParam = new TrussCombParam(wrkDetl);
+ TrussCombParam trussCombParam = new TrussCombParam(wrkDetl,staNoEnd);
try{
ReturnT<String> success = postMesData(reportOutPath, trussCombParam);
if (success.getCode()!=200){
@@ -106,24 +106,26 @@
wrkMastService.updateById(wrkMast);
basDevp.setReportSign(3);
basDevpService.updateById(basDevp);
- basDevp118.setReportSign(3);
- basDevpService.updateById(basDevp118);
+ basDevpEnd.setReportSign(3);
+ basDevpService.updateById(basDevpEnd);
+ wrkDetl.setOrigin(trussCombParam.getPalletizingNo2()==118? "2":"1");
+ wrkDetlService.update(wrkDetl,new EntityWrapper<WrkDetl>().eq("wrk_no",wrkDetl.getWrkNo()));
}
return SUCCESS;
} catch (Exception e){
log.error("妗佹灦涓婁綅杞欢閫�搴撳け璐�"+e);
return FAIL;
}
- }else if (!basDevp118.getLoading().equals("Y") ){
+ }else if (!basDevpEnd.getLoading().equals("Y") ){
Thread.sleep(1000);
- basDevp118 = basDevpService.selectById(118);
- if (Cools.isEmpty(basDevp118) || !basDevp118.getAutoing().equals("Y") || basDevp118.getReportSign()!=0 || !basDevp118.getLoading().equals("Y") ){
+ basDevpEnd = basDevpService.selectById(staNoEnd);
+ if (Cools.isEmpty(basDevpEnd) || !basDevpEnd.getAutoing().equals("Y") || basDevpEnd.getReportSign()!=0 || !basDevpEnd.getLoading().equals("Y") ){
return FAIL;
}
- WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no",118 + 19999L));
+ WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no",staNoEnd + 19999L));
if (Cools.isEmpty(wrkMastSta)){
//鐢熸垚鎷嗙洏浠诲姟
- WrkMastSta wrkMastSta1 = new WrkMastSta(new Date(),118);
+ WrkMastSta wrkMastSta1 = new WrkMastSta(new Date(),staNoEnd);
wrkMastSta1.setType(2); //绫诲瀷 1:闈炵┖ 2:绌烘澘
wrkMastSta1.setWrkType(2); //宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
wrkMastStaService.insert(wrkMastSta1);
@@ -176,4 +178,20 @@
}
return SUCCESS;
}
+
+ public Integer getStaOther(Integer staNo){
+ switch (staNo){
+ case 118:
+ return 119;
+ case 119:
+ return 118;
+ case 120:
+ return 121;
+ case 121:
+ return 120;
+ default:
+ return 0;
+ }
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index cd27e08..d01a8f9 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -65,11 +65,13 @@
if (!Cools.isEmpty(wrkMast.getBarcode())) {
// 淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。
if (!waitPakinLogService.save(wrkMast.getBarcode())) {
- exceptionHandle("淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。[workNo={0}]澶辫触", wrkMast.getWrkNo());
+// exceptionHandle("淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。[workNo={0}]澶辫触", wrkMast.getWrkNo());
+ log.error("淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。[workNo={"+wrkMast.getWrkNo()+"}]澶辫触");
}
// 鍒犻櫎鍏ュ簱閫氱煡妗�
if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()))) {
- exceptionHandle("鍒犻櫎鍏ュ簱閫氱煡妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+// exceptionHandle("鍒犻櫎鍏ュ簱閫氱煡妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+ log.error("鍒犻櫎鍏ュ簱閫氱煡妗workNo={"+wrkMast.getWrkNo()+"}]澶辫触");
}
}
// // 鎵嬪姩鍏ュ簱鐢熸垚鍗曟嵁 銆� 涓婃姤涓夋柟骞冲彴 銆�
diff --git a/src/main/java/com/zy/asrs/utils/OutboundAllocationUtil.java b/src/main/java/com/zy/asrs/utils/OutboundAllocationUtil.java
index 3febe69..869a32b 100644
--- a/src/main/java/com/zy/asrs/utils/OutboundAllocationUtil.java
+++ b/src/main/java/com/zy/asrs/utils/OutboundAllocationUtil.java
@@ -213,11 +213,11 @@
if (locDetlList.size()==0){
continue;
}
- if (sign>lists.size()/2) {
- //120銆�121
- staA=120;
- staB=121;
- }
+// if (sign>lists.size()/2) {
+// //120銆�121
+// staA=120;
+// staB=121;
+// }
List<StockOutParam.LocDetl> locDetlsA = new ArrayList<>();
List<StockOutParam.LocDetl> locDetlsB = new ArrayList<>();
List<String> locNos = new ArrayList<>();
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 124b3c6..698aaf6 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -66,6 +66,10 @@
select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) and io_type != 103 and io_type != 104 and io_type != 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,error_time,io_time,wrk_no
</select>
+ <select id="selectToBeCompleteData202" resultMap="BaseResultMap">
+ select * from asr_wrk_mast where wrk_sts = 52 and io_type = 202 and wrk_no not in (select wrk_no from asr_bas_devp)) order by upd_mk,error_time,io_time,wrk_no
+ </select>
+
<select id="selectToBeHistoryData" resultMap="BaseResultMap">
select * from asr_wrk_mast
where wrk_sts=5
diff --git a/src/main/webapp/static/js/wrkMastSta/wrkMastSta.js b/src/main/webapp/static/js/wrkMastSta/wrkMastSta.js
index b78460c..dc164ea 100644
--- a/src/main/webapp/static/js/wrkMastSta/wrkMastSta.js
+++ b/src/main/webapp/static/js/wrkMastSta/wrkMastSta.js
@@ -28,10 +28,10 @@
,{field: 'wrkEnd', align: 'center',title: '宸ヤ綔妗ｇ粨鏉熶綅缃�',hide: false}
,{field: 'staStart', align: 'center',title: '灏忚溅鎺ヨ揣浣嶇疆',hide: false}
,{field: 'staEnd', align: 'center',title: '灏忚溅鏀捐揣浣嶇疆',hide: false}
- ,{field: 'type', align: 'center',title: '绫诲瀷',hide: false}
- ,{field: 'wrkSts', align: 'center',title: '宸ヤ綔鐘舵��',hide: false}
+ ,{field: 'type$', align: 'center',title: '绫诲瀷',hide: false}
+ ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��',hide: false}
,{field: 'lineNumber', align: 'center',title: '琛屽彿',hide: true}
- ,{field: 'wrkType', align: 'center',title: '宸ヤ綔绫诲瀷',hide: false}
+ ,{field: 'wrkType$', align: 'center',title: '宸ヤ綔绫诲瀷',hide: false}
,{field: 'bignTime$', align: 'center',title: '鏍囪鏃堕棿',hide: false}
,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿',hide: true}
,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿',hide: false}
@@ -151,7 +151,7 @@
admin.open({
type: 1,
area: '600px',
- title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ title: (mData ? '淇敼' : '娣诲姞') + '灏忚溅浣滀笟鐘舵��',
content: $('#editDialog').html(),
success: function (layero, dIndex) {
layDateRender(mData);
diff --git a/src/main/webapp/views/wrkMastSta/wrkMastSta.html b/src/main/webapp/views/wrkMastSta/wrkMastSta.html
index 3ccbe67..c42881a 100644
--- a/src/main/webapp/views/wrkMastSta/wrkMastSta.html
+++ b/src/main/webapp/views/wrkMastSta/wrkMastSta.html
@@ -49,7 +49,7 @@
<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-add" lay-event="addData">鏂板</button>
<!-- <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>-->
<!-- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>-->
</div>
@@ -102,48 +102,84 @@
<input class="layui-input" name="staEnd" placeholder="璇疯緭鍏ュ皬杞︽斁璐т綅缃�" lay-vertype="tips" lay-verify="required">
</div>
</div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">娣诲姞鏃堕棿: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="createTime" id="createTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">淇敼鏃堕棿: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="updateTime" id="updateTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label layui-form-required">绫诲瀷 1:闈炵┖ 2:绌烘澘: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="type" placeholder="璇疯緭鍏ョ被鍨� 1:闈炵┖ 2:绌烘澘" lay-vertype="tips" lay-verify="required">-->
+<!-- </div>-->
+<!-- </div>-->
+ <!-- 绫诲瀷 -->
<div class="layui-form-item">
- <label class="layui-form-label">娣诲姞鏃堕棿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="createTime" id="createTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�">
+ <label class="layui-form-label layui-form-required">绫诲瀷锛�</label>
+ <div class="layui-input-inline">
+ <select name="type">
+ <option value="1">1.闈炵┖</option>
+ <option value="2">2.绌烘澘</option>
+ </select>
</div>
</div>
+ <!-- 绫诲瀷 -->
<div class="layui-form-item">
- <label class="layui-form-label">淇敼鏃堕棿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="updateTime" id="updateTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
+ <label class="layui-form-label layui-form-required">宸ヤ綔鐘舵�侊細</label>
+ <div class="layui-input-inline">
+ <select name="wrkSts">
+ <option value="0">0.鍒濆</option>
+ <option value="1">1.绛夊緟灏忚溅鍙�</option>
+ <option value="2">2.绛夊緟灏忚溅鏀�</option>
+ <option value="3">3.瀹屾垚</option>
+ </select>
</div>
</div>
+ <!-- 绫诲瀷 -->
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">绫诲瀷 0:闈炵┖ 1:绌烘澘: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="type" placeholder="璇疯緭鍏ョ被鍨� 0:闈炵┖ 1:绌烘澘" lay-vertype="tips" lay-verify="required">
+ <label class="layui-form-label layui-form-required">宸ヤ綔绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="wrkType">
+ <option value="1">鍙犵洏</option>
+ <option value="2">鎷嗙洏</option>
+ <option value="3">鍙栨斁</option>
+<!-- <option value="2">2.琛岃蛋</option>-->
+ <option value="5">婊″彇</option>
+ <option value="6">婊℃斁</option>
+ </select>
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氱瓑寰呭皬杞﹀彇 2锛氱瓑寰呭皬杞︽斁 3锛氬畬鎴�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="wrkSts" placeholder="璇疯緭鍏ュ伐浣滅姸鎬� 0锛氬垵濮� 1锛氱瓑寰呭皬杞﹀彇 2锛氱瓑寰呭皬杞︽斁 3锛氬畬鎴�" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label layui-form-required">宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氱瓑寰呭皬杞﹀彇 2锛氱瓑寰呭皬杞︽斁 3锛氬畬鎴�: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="wrkSts" placeholder="璇疯緭鍏ュ伐浣滅姸鎬� 0锛氬垵濮� 1锛氱瓑寰呭皬杞﹀彇 2锛氱瓑寰呭皬杞︽斁 3锛氬畬鎴�" lay-vertype="tips" lay-verify="required">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">琛屽彿: </label>
<div class="layui-input-block">
<input class="layui-input" name="lineNumber" placeholder="璇疯緭鍏ヨ鍙�" lay-vertype="tips" lay-verify="required">
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">宸ヤ綔绫诲瀷: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="wrkType" placeholder="璇疯緭鍏ュ伐浣滅被鍨�" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鏍囪鏃堕棿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="bignTime" id="bignTime$" placeholder="璇疯緭鍏ユ爣璁版椂闂�">
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label layui-form-required">宸ヤ綔绫诲瀷: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="wrkType" placeholder="璇疯緭鍏ュ伐浣滅被鍨�" lay-vertype="tips" lay-verify="required">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">鏍囪鏃堕棿: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="bignTime" id="bignTime$" placeholder="璇疯緭鍏ユ爣璁版椂闂�">-->
+<!-- </div>-->
+<!-- </div>-->
</div>
</div>
--
Gitblit v1.9.1