From cd506c91ff429eb676a14615cd034ecd1f286329 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 08 六月 2024 11:16:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/mapper/WrkMastCrnLogMapper.java | 12
src/main/resources/mapper/WrkMastCrnLogMapper.xml | 32 +
src/main/java/com/zy/asrs/entity/WrkMastCrnLog.java | 346 ++++++++++++++++
src/main/java/com/zy/asrs/controller/WrkMastCrnLogController.java | 125 +++++
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 52 ++
src/main/java/com/zy/common/CodeBuilder.java | 2
src/main/java/com/zy/asrs/entity/WrkMastSplitTwinLog.java | 6
src/main/java/com/zy/asrs/service/impl/WrkMastCrnLogServiceImpl.java | 12
src/main/java/com/zy/asrs/service/WrkMastCrnLogService.java | 8
src/main/webapp/static/js/wrkMastCrnLog/wrkMastCrnLog.js | 276 +++++++++++++
src/main/webapp/views/wrkMastCrnLog/wrkMastCrnLog.html | 266 ++++++++++++
src/main/java/com/zy/asrs/task/WorkLogScheduler.java | 61 ++
src/main/java/wrkMastCrnLog.sql | 18
13 files changed, 1,206 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastCrnLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastCrnLogController.java
new file mode 100644
index 0000000..eafea31
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/WrkMastCrnLogController.java
@@ -0,0 +1,125 @@
+package com.zy.asrs.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.DateUtils;
+import com.zy.asrs.entity.WrkMastCrnLog;
+import com.zy.asrs.service.WrkMastCrnLogService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class WrkMastCrnLogController extends BaseController {
+
+ @Autowired
+ private WrkMastCrnLogService wrkMastCrnLogService;
+
+ @RequestMapping(value = "/wrkMastCrnLog/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(wrkMastCrnLogService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/wrkMastCrnLog/list/auth")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<WrkMastCrnLog> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(WrkMastCrnLog.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(wrkMastCrnLogService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.like(entry.getKey(), val);
+ }
+ }
+ }
+
+ @RequestMapping(value = "/wrkMastCrnLog/add/auth")
+ @ManagerAuth
+ public R add(WrkMastCrnLog wrkMastCrnLog) {
+ wrkMastCrnLogService.insert(wrkMastCrnLog);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/wrkMastCrnLog/update/auth")
+ @ManagerAuth
+ public R update(WrkMastCrnLog wrkMastCrnLog){
+ if (Cools.isEmpty(wrkMastCrnLog) || null==wrkMastCrnLog.getWrkNo()){
+ return R.error();
+ }
+ wrkMastCrnLogService.updateById(wrkMastCrnLog);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/wrkMastCrnLog/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ wrkMastCrnLogService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/wrkMastCrnLog/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<WrkMastCrnLog> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMastCrnLog"));
+ convert(map, wrapper);
+ List<WrkMastCrnLog> list = wrkMastCrnLogService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/wrkMastCrnLogQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<WrkMastCrnLog> wrapper = new EntityWrapper<>();
+ wrapper.like("wrk_no", condition);
+ Page<WrkMastCrnLog> page = wrkMastCrnLogService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (WrkMastCrnLog wrkMastCrnLog : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", wrkMastCrnLog.getWrkNo());
+ map.put("value", wrkMastCrnLog.getWrkNo());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/wrkMastCrnLog/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<WrkMastCrnLog> wrapper = new EntityWrapper<WrkMastCrnLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != wrkMastCrnLogService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(WrkMastCrnLog.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastCrnLog.java b/src/main/java/com/zy/asrs/entity/WrkMastCrnLog.java
new file mode 100644
index 0000000..6f2cdca
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/WrkMastCrnLog.java
@@ -0,0 +1,346 @@
+package com.zy.asrs.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasWrkStatusService;
+import com.zy.asrs.entity.BasWrkStatus;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasWrkIotypeService;
+import com.zy.asrs.entity.BasWrkIotype;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasCrnpService;
+import com.zy.asrs.entity.BasCrnp;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.entity.LocMast;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.entity.BasDevp;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.entity.BasDevp;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.entity.LocMast;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.zy.common.utils.Synchro;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.core.common.SpringUtils;
+import com.zy.system.service.UserService;
+import com.zy.system.entity.User;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("asr_wrk_mast_crn_log")
+public class WrkMastCrnLog implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 宸ヤ綔鍙�
+ */
+ @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @TableId(value = "wrk_no", type = IdType.INPUT)
+ @TableField("wrk_no")
+ private Long wrkNo;
+
+ /**
+ * 宸ヤ綔鐘舵��
+ */
+ @ApiModelProperty(value= "宸ヤ綔鐘舵��")
+ @TableField("wrk_sts")
+ private Long wrkSts;
+
+ /**
+ * 鍏ュ嚭搴撶被鍨�
+ */
+ @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
+ @TableField("io_type")
+ private Integer ioType;
+
+ /**
+ * 鍫嗗灈鏈�
+ */
+ @ApiModelProperty(value= "鍫嗗灈鏈�")
+ @TableField("crn_no")
+ private Integer crnNo;
+
+ /**
+ * 鐩爣搴撲綅
+ */
+ @ApiModelProperty(value= "鐩爣搴撲綅")
+ @TableField("loc_no")
+ private String locNo;
+
+ /**
+ * 鐩爣绔�
+ */
+ @ApiModelProperty(value= "鐩爣绔�")
+ @TableField("sta_no")
+ private Integer staNo;
+
+ /**
+ * 婧愮珯
+ */
+ @ApiModelProperty(value= "婧愮珯")
+ @TableField("source_sta_no")
+ private Integer sourceStaNo;
+
+ /**
+ * 婧愬簱浣�
+ */
+ @ApiModelProperty(value= "婧愬簱浣�")
+ @TableField("source_loc_no")
+ private String sourceLocNo;
+
+ @ApiModelProperty(value= "")
+ @TableField("loc_sts")
+ private String locSts;
+
+ /**
+ * 宸ヤ綔鏃堕棿
+ */
+ @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
+ @TableField("io_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date ioTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("modi_user")
+ private String modiUser;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @TableField("modi_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date modiTime;
+
+ /**
+ * 宸ヤ綔鍙�1
+ */
+ @ApiModelProperty(value= "宸ヤ綔鍙�1")
+ @TableField("wrk_no_one")
+ private Long wrkNoOne;
+
+ /**
+ * 宸ヤ綔鍙�2
+ */
+ @ApiModelProperty(value= "宸ヤ綔鍙�2")
+ @TableField("wrk_no_two")
+ private Long wrkNoTwo;
+
+ /**
+ * 鐩爣搴撲綅1
+ */
+ @ApiModelProperty(value= "鐩爣搴撲綅1")
+ @TableField("loc_no_one")
+ private String locNoOne;
+
+ /**
+ * 鐩爣搴撲綅2
+ */
+ @ApiModelProperty(value= "鐩爣搴撲綅2")
+ @TableField("loc_no_two")
+ private String locNoTwo;
+
+ /**
+ * 鐩爣绔�1
+ */
+ @ApiModelProperty(value= "鐩爣绔�1")
+ @TableField("sta_no_one")
+ private Integer staNoOne;
+
+ /**
+ * 鐩爣绔�2
+ */
+ @ApiModelProperty(value= "鐩爣绔�2")
+ @TableField("sta_no_two")
+ private Integer staNoTwo;
+
+ /**
+ * 婧愮珯1
+ */
+ @ApiModelProperty(value= "婧愮珯1")
+ @TableField("source_sta_no_one")
+ private Integer sourceStaNoOne;
+
+ /**
+ * 婧愮珯2
+ */
+ @ApiModelProperty(value= "婧愮珯2")
+ @TableField("source_sta_no_two")
+ private Integer sourceStaNoTwo;
+
+ /**
+ * 婧愬簱浣�1
+ */
+ @ApiModelProperty(value= "婧愬簱浣�1")
+ @TableField("source_loc_no_one")
+ private String sourceLocNoOne;
+
+ /**
+ * 婧愬簱浣�2
+ */
+ @ApiModelProperty(value= "婧愬簱浣�2")
+ @TableField("source_loc_no_two")
+ private String sourceLocNoTwo;
+
+ public WrkMastCrnLog() {}
+
+ public WrkMastCrnLog(Long wrkNo,Long wrkSts,Integer ioType,Integer crnNo,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String locSts,Date ioTime,String modiUser,Date modiTime,Long wrkNoOne,Long wrkNoTwo,String locNoOne,String locNoTwo,Integer staNoOne,Integer staNoTwo,Integer sourceStaNoOne,Integer sourceStaNoTwo,String sourceLocNoOne,String sourceLocNoTwo) {
+ this.wrkNo = wrkNo;
+ this.wrkSts = wrkSts;
+ this.ioType = ioType;
+ this.crnNo = crnNo;
+ this.locNo = locNo;
+ this.staNo = staNo;
+ this.sourceStaNo = sourceStaNo;
+ this.sourceLocNo = sourceLocNo;
+ this.locSts = locSts;
+ this.ioTime = ioTime;
+ this.modiUser = modiUser;
+ this.modiTime = modiTime;
+ this.wrkNoOne = wrkNoOne;
+ this.wrkNoTwo = wrkNoTwo;
+ this.locNoOne = locNoOne;
+ this.locNoTwo = locNoTwo;
+ this.staNoOne = staNoOne;
+ this.staNoTwo = staNoTwo;
+ this.sourceStaNoOne = sourceStaNoOne;
+ this.sourceStaNoTwo = sourceStaNoTwo;
+ this.sourceLocNoOne = sourceLocNoOne;
+ this.sourceLocNoTwo = sourceLocNoTwo;
+ }
+
+// WrkMastCrnLog wrkMastCrnLog = new WrkMastCrnLog(
+// null, // 宸ヤ綔鍙穂闈炵┖]
+// null, // 宸ヤ綔鐘舵��
+// null, // 鍏ュ嚭搴撶被鍨�
+// null, // 鍫嗗灈鏈�
+// null, // 鐩爣搴撲綅
+// null, // 鐩爣绔�
+// null, // 婧愮珯
+// null, // 婧愬簱浣�
+// null, //
+// null, // 宸ヤ綔鏃堕棿
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 宸ヤ綔鍙�1
+// null, // 宸ヤ綔鍙�2
+// null, // 鐩爣搴撲綅1
+// null, // 鐩爣搴撲綅2
+// null, // 鐩爣绔�1
+// null, // 鐩爣绔�2
+// null, // 婧愮珯1
+// null, // 婧愮珯2
+// null, // 婧愬簱浣�1
+// null // 婧愬簱浣�2
+// );
+
+ public String getWrkSts$(){
+ BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
+ BasWrkStatus basWrkStatus = service.selectById(this.wrkSts);
+ if (!Cools.isEmpty(basWrkStatus)){
+ return String.valueOf(basWrkStatus.getWrkDesc());
+ }
+ return null;
+ }
+
+ public String getIoType$(){
+ BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
+ BasWrkIotype basWrkIotype = service.selectById(this.ioType);
+ if (!Cools.isEmpty(basWrkIotype)){
+ return String.valueOf(basWrkIotype.getIoDesc());
+ }
+ return null;
+ }
+
+ public String getCrnNo$(){
+ BasCrnpService service = SpringUtils.getBean(BasCrnpService.class);
+ BasCrnp basCrnp = service.selectById(this.crnNo);
+ if (!Cools.isEmpty(basCrnp)){
+ return String.valueOf(basCrnp.getCrnNo());
+ }
+ return null;
+ }
+
+ public String getLocNo$(){
+ LocMastService service = SpringUtils.getBean(LocMastService.class);
+ LocMast locMast = service.selectById(this.locNo);
+ if (!Cools.isEmpty(locMast)){
+ return String.valueOf(locMast.getLocNo());
+ }
+ return null;
+ }
+
+ public String getStaNo$(){
+ BasDevpService service = SpringUtils.getBean(BasDevpService.class);
+ BasDevp basDevp = service.selectById(this.staNo);
+ if (!Cools.isEmpty(basDevp)){
+ return String.valueOf(basDevp.getDevNo());
+ }
+ return null;
+ }
+
+ public String getSourceStaNo$(){
+ BasDevpService service = SpringUtils.getBean(BasDevpService.class);
+ BasDevp basDevp = service.selectById(this.sourceStaNo);
+ if (!Cools.isEmpty(basDevp)){
+ return String.valueOf(basDevp.getDevNo());
+ }
+ return null;
+ }
+
+ public String getSourceLocNo$(){
+ LocMastService service = SpringUtils.getBean(LocMastService.class);
+ LocMast locMast = service.selectById(this.sourceLocNo);
+ if (!Cools.isEmpty(locMast)){
+ return String.valueOf(locMast.getLocNo());
+ }
+ return null;
+ }
+
+ public String getIoTime$(){
+ if (Cools.isEmpty(this.ioTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
+ }
+
+ public String getModiUser$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.modiUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getModiTime$(){
+ if (Cools.isEmpty(this.modiTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
+ }
+
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastSplitTwinLog.java b/src/main/java/com/zy/asrs/entity/WrkMastSplitTwinLog.java
index 6b5545b..5c4d8e1 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastSplitTwinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastSplitTwinLog.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotations.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import com.zy.common.utils.Synchro;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -272,5 +274,9 @@
}
}
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastCrnLogMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastCrnLogMapper.java
new file mode 100644
index 0000000..ed474cb
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastCrnLogMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.WrkMastCrnLog;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface WrkMastCrnLogMapper extends BaseMapper<WrkMastCrnLog> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastCrnLogService.java b/src/main/java/com/zy/asrs/service/WrkMastCrnLogService.java
new file mode 100644
index 0000000..02a22d3
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/WrkMastCrnLogService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.WrkMastCrnLog;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface WrkMastCrnLogService extends IService<WrkMastCrnLog> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastCrnLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastCrnLogServiceImpl.java
new file mode 100644
index 0000000..819126b
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastCrnLogServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.WrkMastCrnLogMapper;
+import com.zy.asrs.entity.WrkMastCrnLog;
+import com.zy.asrs.service.WrkMastCrnLogService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("wrkMastCrnLogService")
+public class WrkMastCrnLogServiceImpl extends ServiceImpl<WrkMastCrnLogMapper, WrkMastCrnLog> implements WrkMastCrnLogService {
+
+}
diff --git a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
index 4dea664..a18576c 100644
--- a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -3,8 +3,12 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.WrkMastCrn;
+import com.zy.asrs.entity.WrkMastSplitTwin;
import com.zy.asrs.entity.WrkMastSta;
+import com.zy.asrs.service.WrkMastCrnService;
import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.service.WrkMastSplitTwinService;
import com.zy.asrs.service.WrkMastStaService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WorkLogHandler;
@@ -28,6 +32,10 @@
private WrkMastService wrkMastService;
@Autowired
private WrkMastStaService wrkMastStaService;
+ @Autowired
+ private WrkMastSplitTwinService wrkMastSplitTwinService;
+ @Autowired
+ private WrkMastCrnService wrkMastCrnService;
@Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
@@ -36,9 +44,13 @@
return;
}
for (WrkMast wrkMast : wrkMasts) {
- ReturnT<String> result = workLogHandler.start(wrkMast);
- if (!result.isSuccess()) {
- log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�", wrkMast.getWrkNo());
+ try{
+ ReturnT<String> result = workLogHandler.start(wrkMast);
+ if (!result.isSuccess()) {
+ log.error("wrkMast宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�", wrkMast.getWrkNo());
+ }
+ }catch (Exception e){
+ log.error("wrkMast宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�,寮傚父鍘熷洜={}", wrkMast.getWrkNo(),e.getMessage());
}
}
}
@@ -46,13 +58,44 @@
@Scheduled(cron = "0/3 * * * * ? ")
private void execute2(){
List<WrkMastSta> wrkMastStaList = wrkMastStaService.selectList(new EntityWrapper<WrkMastSta>().eq("wrk_sts", 3));
- if (Cools.isEmpty(wrkMastStaList) || wrkMastStaList.size()==0) {
- return;
- }
for (WrkMastSta wrkMastSta : wrkMastStaList) {
- ReturnT<String> result = workLogHandler.start(wrkMastSta);
- if (!result.isSuccess()) {
- log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�", wrkMastSta.getWrkNo());
+ try{
+ ReturnT<String> result = workLogHandler.start(wrkMastSta);
+ if (!result.isSuccess()) {
+ log.error("wrkMastSta宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�", wrkMastSta.getWrkNo());
+ }
+ }catch (Exception e){
+ log.error("wrkMastSta宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�,寮傚父鍘熷洜={}", wrkMastSta.getWrkNo(),e.getMessage());
+ }
+ }
+ }
+
+ @Scheduled(cron = "0/3 * * * * ? ")
+ private void execute3(){
+ List<WrkMastSplitTwin> wrkMastSplitTwinList = wrkMastSplitTwinService.selectList(new EntityWrapper<WrkMastSplitTwin>().eq("wrk_sts", 4));
+ for (WrkMastSplitTwin wrkMastSplitTwin : wrkMastSplitTwinList) {
+ try{
+ ReturnT<String> result = workLogHandler.start(wrkMastSplitTwin);
+ if (!result.isSuccess()) {
+ log.error("wrkMastSplitTwin宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�", wrkMastSplitTwin.getWrkNo());
+ }
+ }catch (Exception e){
+ log.error("wrkMastSplitTwin宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�,寮傚父鍘熷洜={}", wrkMastSplitTwin.getWrkNo(),e.getMessage());
+ }
+ }
+ }
+
+ @Scheduled(cron = "0/3 * * * * ? ")
+ private void execute4(){
+ List<WrkMastCrn> wrkMastCrnList = wrkMastCrnService.selectList(new EntityWrapper<WrkMastCrn>().eq("wrk_sts", 4).or().eq("wrk_sts",14));
+ for (WrkMastCrn wrkMastCrn : wrkMastCrnList) {
+ try{
+ ReturnT<String> result = workLogHandler.start(wrkMastCrn);
+ if (!result.isSuccess()) {
+ log.error("wrkMastCrn宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�", wrkMastCrn.getWrkNo());
+ }
+ }catch (Exception e){
+ log.error("wrkMastCrn宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�,寮傚父鍘熷洜={}", wrkMastCrn.getWrkNo(),e.getMessage());
}
}
}
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 3eabe70..35c3e9f 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -40,6 +40,15 @@
private WrkMastStaService wrkMastStaService;
@Autowired
private WrkMastStaLogService wrkMastStaLogService;
+ @Autowired
+ private WrkMastSplitTwinService wrkMastSplitTwinService;
+ @Autowired
+ private WrkMastSplitTwinLogService wrkMastSplitTwinLogService;
+ @Autowired
+ private WrkMastCrnService wrkMastCrnService;
+ @Autowired
+ private WrkMastCrnLogService wrkMastCrnLogService;
+
@Transactional
public ReturnT<String> start(WrkMast wrkMast) {
@@ -152,4 +161,47 @@
return SUCCESS;
}
+ @Transactional
+ public ReturnT<String> start(WrkMastSplitTwin wrkMastSplitTwin) {
+ try {
+ WrkMastSplitTwinLog wrkMastSplitTwinLog = new WrkMastSplitTwinLog();
+ wrkMastSplitTwinLog.sync(wrkMastSplitTwin);
+ // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+ if (!wrkMastSplitTwinLogService.insert(wrkMastSplitTwinLog)) {
+ exceptionHandle("淇濆瓨wrkMastSplitTwinLog宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMastSplitTwin.getWrkNo());
+ }
+ // 鍒犻櫎宸ヤ綔涓绘。
+ if (!wrkMastSplitTwinService.deleteById(wrkMastSplitTwin)) {
+ exceptionHandle("鍒犻櫎wrkMastSplitTwin宸ヤ綔涓绘。[workNo={0}]澶辫触", wrkMastSplitTwin.getWrkNo());
+ }
+ } catch (Exception e) {
+ log.error("fail", e);
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ }
+ return SUCCESS;
+ }
+
+ @Transactional
+ public ReturnT<String> start(WrkMastCrn wrkMastCrn) {
+ try {
+ WrkMastCrnLog wrkMastCrnLog = new WrkMastCrnLog();
+ wrkMastCrnLog.sync(wrkMastCrn);
+ // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+ if (!wrkMastCrnLogService.insert(wrkMastCrnLog)) {
+ exceptionHandle("淇濆瓨wrkMastCrnLog宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMastCrn.getWrkNo());
+ }
+ // 鍒犻櫎宸ヤ綔涓绘。
+ if (!wrkMastCrnService.deleteById(wrkMastCrn)) {
+ exceptionHandle("鍒犻櫎wrkMastCrn宸ヤ綔涓绘。[workNo={0}]澶辫触", wrkMastCrn.getWrkNo());
+ }
+ } catch (Exception e) {
+ log.error("fail", e);
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ }
+ return SUCCESS;
+ }
+
+
}
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index 09e6dd3..59dd6a5 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -20,7 +20,7 @@
generator.url="192.168.4.15:1433;databasename=ahyxasrs";
generator.username="sa";
generator.password="sa@123";
- generator.table="asr_wrk_mast_split_twin_log";
+ generator.table="asr_wrk_mast_crn_log";
generator.packagePath="com.zy.asrs";
generator.build();
}
diff --git a/src/main/java/wrkMastCrnLog.sql b/src/main/java/wrkMastCrnLog.sql
new file mode 100644
index 0000000..fc658dd
--- /dev/null
+++ b/src/main/java/wrkMastCrnLog.sql
@@ -0,0 +1,18 @@
+-- save wrkMastCrnLog record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastCrnLog/wrkMastCrnLog.html', 'wrkMastCrnLog绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastCrnLog#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastCrnLog#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastCrnLog#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastCrnLog#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastCrnLog#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastCrnLog/wrkMastCrnLog.html', N'wrkMastCrnLog绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastCrnLog#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastCrnLog#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastCrnLog#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastCrnLog#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastCrnLog#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/resources/mapper/WrkMastCrnLogMapper.xml b/src/main/resources/mapper/WrkMastCrnLogMapper.xml
new file mode 100644
index 0000000..2def3f1
--- /dev/null
+++ b/src/main/resources/mapper/WrkMastCrnLogMapper.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.mapper.WrkMastCrnLogMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMastCrnLog">
+ <result column="wrk_no" property="wrkNo" />
+ <result column="wrk_sts" property="wrkSts" />
+ <result column="io_type" property="ioType" />
+ <result column="crn_no" property="crnNo" />
+ <result column="loc_no" property="locNo" />
+ <result column="sta_no" property="staNo" />
+ <result column="source_sta_no" property="sourceStaNo" />
+ <result column="source_loc_no" property="sourceLocNo" />
+ <result column="loc_sts" property="locSts" />
+ <result column="io_time" property="ioTime" />
+ <result column="modi_user" property="modiUser" />
+ <result column="modi_time" property="modiTime" />
+ <result column="wrk_no_one" property="wrkNoOne" />
+ <result column="wrk_no_two" property="wrkNoTwo" />
+ <result column="loc_no_one" property="locNoOne" />
+ <result column="loc_no_two" property="locNoTwo" />
+ <result column="sta_no_one" property="staNoOne" />
+ <result column="sta_no_two" property="staNoTwo" />
+ <result column="source_sta_no_one" property="sourceStaNoOne" />
+ <result column="source_sta_no_two" property="sourceStaNoTwo" />
+ <result column="source_loc_no_one" property="sourceLocNoOne" />
+ <result column="source_loc_no_two" property="sourceLocNoTwo" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/wrkMastCrnLog/wrkMastCrnLog.js b/src/main/webapp/static/js/wrkMastCrnLog/wrkMastCrnLog.js
new file mode 100644
index 0000000..75882a1
--- /dev/null
+++ b/src/main/webapp/static/js/wrkMastCrnLog/wrkMastCrnLog.js
@@ -0,0 +1,276 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#wrkMastCrnLog',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/wrkMastCrnLog/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
+ ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
+ ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�'}
+ ,{field: 'crnNo$', align: 'center',title: '鍫嗗灈鏈�'}
+ ,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'}
+ ,{field: 'staNo$', align: 'center',title: '鐩爣绔�'}
+ ,{field: 'sourceStaNo$', align: 'center',title: '婧愮珯'}
+ ,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�'}
+ ,{field: 'locSts', align: 'center',title: ''}
+ ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
+ ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'wrkNoOne', align: 'center',title: '宸ヤ綔鍙�1'}
+ ,{field: 'wrkNoTwo', align: 'center',title: '宸ヤ綔鍙�2'}
+ ,{field: 'locNoOne', align: 'center',title: '鐩爣搴撲綅1'}
+ ,{field: 'locNoTwo', align: 'center',title: '鐩爣搴撲綅2'}
+ ,{field: 'staNoOne', align: 'center',title: '鐩爣绔�1'}
+ ,{field: 'staNoTwo', align: 'center',title: '鐩爣绔�2'}
+ ,{field: 'sourceStaNoOne', align: 'center',title: '婧愮珯1'}
+ ,{field: 'sourceStaNoTwo', align: 'center',title: '婧愮珯2'}
+ ,{field: 'sourceLocNoOne', align: 'center',title: '婧愬簱浣�1'}
+ ,{field: 'sourceLocNoTwo', align: 'center',title: '婧愬簱浣�2'}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(wrkMastCrnLog)', function (obj) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ searchData['orderByField'] = obj.field;
+ searchData['orderByType'] = obj.type;
+ tableIns.reload({
+ where: searchData,
+ page: {curr: 1}
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(wrkMastCrnLog)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id).data;
+ switch(obj.event) {
+ case 'addData':
+ showEditModel();
+ break;
+ case 'deleteData':
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ del(checkStatus.map(function (d) {
+ return d.wrkNo;
+ }));
+ break;
+ case 'exportData':
+ admin.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);
+ fields.push(col.field);
+ }
+ });
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
+ var param = {
+ 'wrkMastCrnLog': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/wrkMastCrnLog/export/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(wrkMastCrnLog)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ del([data.wrkNo]);
+ break;
+ }
+ });
+
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender(mData);
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/wrkMastCrnLog/"+(mData?'update':'add')+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
+
+ /* 鍒犻櫎 */
+ function del(ids) {
+ layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/wrkMastCrnLog/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender(data) {
+ setTimeout(function () {
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+ layDate.render({
+ elem: '#ioTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['ioTime\\$']:null
+ });
+ layDate.render({
+ elem: '#modiTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['modiTime\\$']:null
+ });
+
+ }, 300);
+ }
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/views/wrkMastCrnLog/wrkMastCrnLog.html b/src/main/webapp/views/wrkMastCrnLog/wrkMastCrnLog.html
new file mode 100644
index 0000000..d3d1726
--- /dev/null
+++ b/src/main/webapp/views/wrkMastCrnLog/wrkMastCrnLog.html
@@ -0,0 +1,266 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <div class="layui-form toolbar" id="search-box">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline"> 
+ <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+ <i class="layui-icon"></i>閲嶇疆
+ </button>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="wrkMastCrnLog" lay-filter="wrkMastCrnLog"></table>
+ </div>
+ </div>
+</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 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>
+</script>
+
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<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/wrkMastCrnLog/wrkMastCrnLog.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">宸ヤ綔鍙�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkNo" 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 cool-auto-complete">
+ <input class="layui-input" name="wrkSts" placeholder="璇疯緭鍏ュ伐浣滅姸鎬�" style="display: none">
+ <input id="wrkSts$" name="wrkSts$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ伐浣滅姸鎬�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="basWrkStatusQueryBywrkSts" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basWrkStatusQueryBywrkStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍏ュ嚭搴撶被鍨�: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="ioType" placeholder="璇疯緭鍏ュ叆鍑哄簱绫诲瀷" style="display: none">
+ <input id="ioType$" name="ioType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ叆鍑哄簱绫诲瀷" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="basWrkIotypeQueryByioType" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basWrkIotypeQueryByioTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍫嗗灈鏈�: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="crnNo" placeholder="璇疯緭鍏ュ爢鍨涙満" style="display: none">
+ <input id="crnNo$" name="crnNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ爢鍨涙満" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="basCrnpQueryBycrnNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basCrnpQueryBycrnNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐩爣搴撲綅: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="locNo" placeholder="璇疯緭鍏ョ洰鏍囧簱浣�" style="display: none">
+ <input id="locNo$" name="locNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ョ洰鏍囧簱浣�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="locMastQueryBylocNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="locMastQueryBylocNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐩爣绔�: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="staNo" placeholder="璇疯緭鍏ョ洰鏍囩珯" style="display: none">
+ <input id="staNo$" name="staNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ョ洰鏍囩珯" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="basDevpQueryBystaNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basDevpQueryBystaNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">婧愮珯: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="sourceStaNo" placeholder="璇疯緭鍏ユ簮绔�" style="display: none">
+ <input id="sourceStaNo$" name="sourceStaNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ユ簮绔�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="basDevpQueryBysourceStaNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basDevpQueryBysourceStaNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">婧愬簱浣�: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="sourceLocNo" placeholder="璇疯緭鍏ユ簮搴撲綅" style="display: none">
+ <input id="sourceLocNo$" name="sourceLocNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ユ簮搴撲綅" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="locMastQueryBysourceLocNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="locMastQueryBysourceLocNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="locSts" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">宸ヤ綔鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="ioTime" id="ioTime$" placeholder="璇疯緭鍏ュ伐浣滄椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">淇敼浜哄憳: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="modiUser" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none">
+ <input id="modiUser$" name="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">淇敼鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="modiTime" id="modiTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">宸ヤ綔鍙�1: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkNoOne" placeholder="璇疯緭鍏ュ伐浣滃彿1">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">宸ヤ綔鍙�2: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkNoTwo" placeholder="璇疯緭鍏ュ伐浣滃彿2">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐩爣搴撲綅1: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="locNoOne" placeholder="璇疯緭鍏ョ洰鏍囧簱浣�1">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐩爣搴撲綅2: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="locNoTwo" placeholder="璇疯緭鍏ョ洰鏍囧簱浣�2">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐩爣绔�1: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="staNoOne" placeholder="璇疯緭鍏ョ洰鏍囩珯1">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐩爣绔�2: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="staNoTwo" placeholder="璇疯緭鍏ョ洰鏍囩珯2">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">婧愮珯1: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="sourceStaNoOne" placeholder="璇疯緭鍏ユ簮绔�1">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">婧愮珯2: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="sourceStaNoTwo" placeholder="璇疯緭鍏ユ簮绔�2">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">婧愬簱浣�1: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="sourceLocNoOne" placeholder="璇疯緭鍏ユ簮搴撲綅1">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">婧愬簱浣�2: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="sourceLocNoTwo" placeholder="璇疯緭鍏ユ簮搴撲綅2">
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
+</html>
+
--
Gitblit v1.9.1