From b71744d0f1da771a4c8817b1ec2069ec7bb06a93 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 11 六月 2024 16:56:19 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/mapper/BasJarMastLogMapper.java | 12
src/main/java/basJarMastLog.sql | 18 +
src/main/java/com/zy/asrs/controller/BasJarMastController.java | 17
src/main/java/com/zy/asrs/service/BasJarMastLogService.java | 8
src/main/webapp/views/basJarMastLog/basJarMastLog.html | 182 +++++++++++
src/main/java/com/zy/asrs/entity/BasJarMastLog.java | 211 +++++++++++++
src/main/java/com/zy/asrs/service/impl/BasJarMastLogServiceImpl.java | 12
src/main/resources/mapper/BasJarMastLogMapper.xml | 26 +
src/main/webapp/static/js/basJarMastLog/basJarMastLog.js | 275 +++++++++++++++++
src/main/java/com/zy/asrs/controller/BasJarMastLogController.java | 160 ++++++++++
src/main/java/com/zy/common/CodeBuilder.java | 2
src/main/webapp/views/deviceOperate/jarOperate.html | 3
12 files changed, 920 insertions(+), 6 deletions(-)
diff --git a/src/main/java/basJarMastLog.sql b/src/main/java/basJarMastLog.sql
new file mode 100644
index 0000000..760975b
--- /dev/null
+++ b/src/main/java/basJarMastLog.sql
@@ -0,0 +1,18 @@
+-- save basJarMastLog record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basJarMastLog/basJarMastLog.html', 'basJarMastLog绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basJarMastLog#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basJarMastLog#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basJarMastLog#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basJarMastLog#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basJarMastLog#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basJarMastLog/basJarMastLog.html', N'basJarMastLog绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basJarMastLog#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basJarMastLog#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basJarMastLog#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basJarMastLog#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basJarMastLog#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/java/com/zy/asrs/controller/BasJarMastController.java b/src/main/java/com/zy/asrs/controller/BasJarMastController.java
index bb8f517..e98531a 100644
--- a/src/main/java/com/zy/asrs/controller/BasJarMastController.java
+++ b/src/main/java/com/zy/asrs/controller/BasJarMastController.java
@@ -41,11 +41,20 @@
return R.error("鏈煡璇㈠埌淇℃伅");
}
ArrayList<JarMastTableVo> jarMastTableVos = new ArrayList<>();
- jarMasts.forEach(jarMast -> {
+ for (BasJarMast jarMast : jarMasts) {
JarMastTableVo jarMastTableVo = new JarMastTableVo();
- wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", jarMast.getWrkNo()));
- wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", jarMast.getWrkNo()));
- });
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", jarMast.getWrkNo()));
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", jarMast.getWrkNo()));
+ if (Cools.isEmpty(wrkMast) || Cools.isEmpty(wrkDetls)){
+ return R.error("鏈煡璇㈠埌浠诲姟鏁版嵁");
+ }
+ jarMastTableVo.setJarId(jarMast.getJarId());
+ jarMastTableVo.setJarWrkNo(jarMast.getWrkNo().toString());
+ jarMastTableVo.setStatus(jarMast.getStatus());
+ jarMastTableVo.setMatnr(wrkDetls.get(0).getMatnr());
+ jarMastTableVo.setMaktx(wrkDetls.get(0).getMaktx());
+ jarMastTableVos.add(jarMastTableVo);
+ }
return R.ok(jarMastTableVos);
}
diff --git a/src/main/java/com/zy/asrs/controller/BasJarMastLogController.java b/src/main/java/com/zy/asrs/controller/BasJarMastLogController.java
new file mode 100644
index 0000000..a531d77
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasJarMastLogController.java
@@ -0,0 +1,160 @@
+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.BasJarMast;
+import com.zy.asrs.entity.BasJarMastLog;
+import com.zy.asrs.entity.WrkDetl;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.vo.JarMastTableVo;
+import com.zy.asrs.service.BasJarMastLogService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.asrs.service.WrkDetlService;
+import com.zy.asrs.service.WrkMastService;
+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 BasJarMastLogController extends BaseController {
+
+ @Autowired
+ private BasJarMastLogService basJarMastLogService;
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+
+ @RequestMapping(value = "/basJarMastLog/historicalTasks/auth")
+ @ManagerAuth
+ public R historicalTasks(@RequestParam Integer id) {
+ List<BasJarMastLog> jarMasts = basJarMastLogService.selectList(new EntityWrapper<BasJarMastLog>().eq("jar_id", id).orderBy("io_time",false));
+ if (Cools.isEmpty(jarMasts)){
+ return R.error("鏈煡璇㈠埌淇℃伅");
+ }
+ ArrayList<JarMastTableVo> jarMastTableVos = new ArrayList<>();
+ for (BasJarMastLog jarMast : jarMasts) {
+ JarMastTableVo jarMastTableVo = new JarMastTableVo();
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", jarMast.getWrkNo()));
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", jarMast.getWrkNo()));
+ if (Cools.isEmpty(wrkMast) || Cools.isEmpty(wrkDetls)){
+ return R.error("鏈煡璇㈠埌浠诲姟鏁版嵁");
+ }
+ jarMastTableVo.setJarId(jarMast.getJarId());
+ jarMastTableVo.setJarWrkNo(jarMast.getWrkNo().toString());
+ jarMastTableVo.setStatus(jarMast.getStatus());
+ jarMastTableVo.setMatnr(wrkDetls.get(0).getMatnr());
+ jarMastTableVo.setMaktx(wrkDetls.get(0).getMaktx());
+ jarMastTableVos.add(jarMastTableVo);
+ }
+ return R.ok(jarMastTableVos);
+ }
+
+ @RequestMapping(value = "/basJarMastLog/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(basJarMastLogService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/basJarMastLog/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<BasJarMastLog> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(BasJarMastLog.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(basJarMastLogService.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 = "/basJarMastLog/add/auth")
+ @ManagerAuth
+ public R add(BasJarMastLog basJarMastLog) {
+ basJarMastLogService.insert(basJarMastLog);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basJarMastLog/update/auth")
+ @ManagerAuth
+ public R update(BasJarMastLog basJarMastLog){
+ if (Cools.isEmpty(basJarMastLog) || null==basJarMastLog.getId()){
+ return R.error();
+ }
+ basJarMastLogService.updateById(basJarMastLog);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basJarMastLog/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ basJarMastLogService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basJarMastLog/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<BasJarMastLog> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("basJarMastLog"));
+ convert(map, wrapper);
+ List<BasJarMastLog> list = basJarMastLogService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/basJarMastLogQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<BasJarMastLog> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<BasJarMastLog> page = basJarMastLogService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (BasJarMastLog basJarMastLog : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", basJarMastLog.getId());
+ map.put("value", basJarMastLog.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/basJarMastLog/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<BasJarMastLog> wrapper = new EntityWrapper<BasJarMastLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basJarMastLogService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(BasJarMastLog.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/BasJarMastLog.java b/src/main/java/com/zy/asrs/entity/BasJarMastLog.java
new file mode 100644
index 0000000..586296f
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasJarMastLog.java
@@ -0,0 +1,211 @@
+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.BasJarMastStatusService;
+import com.zy.asrs.entity.BasJarMastStatus;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+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_bas_jar_mast_log")
+public class BasJarMastLog implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 宸ヤ綔鍙�
+ */
+ @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @TableField("wrk_no")
+ private Long wrkNo;
+
+ /**
+ * 鍏ュ簱婧愮珯鐐�
+ */
+ @ApiModelProperty(value= "鍏ュ簱婧愮珯鐐�")
+ @TableField("enter_sta_no")
+ private Integer enterStaNo;
+
+ /**
+ * 鍏ュ簱鐩爣绔欑偣
+ */
+ @ApiModelProperty(value= "鍏ュ簱鐩爣绔欑偣")
+ @TableField("out_sta_no")
+ private Integer outStaNo;
+
+ /**
+ * 鍏ョ～鍖栫綈绔欑偣
+ */
+ @ApiModelProperty(value= "鍏ョ～鍖栫綈绔欑偣")
+ @TableField("jar_enter_sta_no")
+ private Integer jarEnterStaNo;
+
+ /**
+ * 鍑虹～鍖栫綈绔欑偣
+ */
+ @ApiModelProperty(value= "鍑虹～鍖栫綈绔欑偣")
+ @TableField("jar_out_sta_no")
+ private Integer jarOutStaNo;
+
+ /**
+ * 纭寲缃怚D
+ */
+ @ApiModelProperty(value= "纭寲缃怚D")
+ @TableField("jar_id")
+ private Integer jarId;
+
+ /**
+ * 鍖哄煙
+ */
+ @ApiModelProperty(value= "鍖哄煙")
+ @TableField("jar_regin")
+ private Integer jarRegin;
+
+ /**
+ * 宸ヤ綔鐘舵��
+ */
+ @ApiModelProperty(value= "宸ヤ綔鐘舵��")
+ private Integer status;
+
+ /**
+ * 鍏ョ綈灏忚溅
+ */
+ @ApiModelProperty(value= "鍏ョ綈灏忚溅")
+ @TableField("enter_ste_no")
+ private Integer enterSteNo;
+
+ /**
+ * 鍑虹綈灏忚溅
+ */
+ @ApiModelProperty(value= "鍑虹綈灏忚溅")
+ @TableField("out_ste_id")
+ private Integer outSteId;
+
+ /**
+ * 鍏ョ綈RGV
+ */
+ @ApiModelProperty(value= "鍏ョ綈RGV")
+ @TableField("enter_rgv_id")
+ private Integer enterRgvId;
+
+ /**
+ * 鍑虹綈RGV
+ */
+ @ApiModelProperty(value= "鍑虹綈RGV")
+ @TableField("out_rgv_id")
+ private Integer outRgvId;
+
+ /**
+ * 鍏ュ簱鏃堕棿
+ */
+ @ApiModelProperty(value= "鍏ュ簱鏃堕棿")
+ @TableField("io_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date ioTime;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @ApiModelProperty(value= "鍒涘缓鏃堕棿")
+ @TableField("modi_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date modiTime;
+
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ @ApiModelProperty(value= "鏇存柊鏃堕棿")
+ @TableField("appe_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date appeTime;
+
+ public BasJarMastLog() {}
+
+ public BasJarMastLog(Long wrkNo,Integer enterStaNo,Integer outStaNo,Integer jarEnterStaNo,Integer jarOutStaNo,Integer jarId,Integer jarRegin,Integer status,Integer enterSteNo,Integer outSteId,Integer enterRgvId,Integer outRgvId,Date ioTime,Date modiTime,Date appeTime) {
+ this.wrkNo = wrkNo;
+ this.enterStaNo = enterStaNo;
+ this.outStaNo = outStaNo;
+ this.jarEnterStaNo = jarEnterStaNo;
+ this.jarOutStaNo = jarOutStaNo;
+ this.jarId = jarId;
+ this.jarRegin = jarRegin;
+ this.status = status;
+ this.enterSteNo = enterSteNo;
+ this.outSteId = outSteId;
+ this.enterRgvId = enterRgvId;
+ this.outRgvId = outRgvId;
+ this.ioTime = ioTime;
+ this.modiTime = modiTime;
+ this.appeTime = appeTime;
+ }
+
+// BasJarMastLog basJarMastLog = new BasJarMastLog(
+// null, // 宸ヤ綔鍙穂闈炵┖]
+// null, // 鍏ュ簱婧愮珯鐐筟闈炵┖]
+// null, // 鍏ュ簱鐩爣绔欑偣[闈炵┖]
+// null, // 鍏ョ～鍖栫綈绔欑偣[闈炵┖]
+// null, // 鍑虹～鍖栫綈绔欑偣[闈炵┖]
+// null, // 纭寲缃怚D[闈炵┖]
+// null, // 鍖哄煙[闈炵┖]
+// null, // 宸ヤ綔鐘舵�乕闈炵┖]
+// null, // 鍏ョ綈灏忚溅[闈炵┖]
+// null, // 鍑虹綈灏忚溅[闈炵┖]
+// null, // 鍏ョ綈RGV[闈炵┖]
+// null, // 鍑虹綈RGV[闈炵┖]
+// null, // 鍏ュ簱鏃堕棿
+// null, // 鍒涘缓鏃堕棿
+// null // 鏇存柊鏃堕棿
+// );
+
+ public String getStatus$(){
+ BasJarMastStatusService service = SpringUtils.getBean(BasJarMastStatusService.class);
+ BasJarMastStatus basJarMastStatus = service.selectById(this.status);
+ if (!Cools.isEmpty(basJarMastStatus)){
+ return String.valueOf(basJarMastStatus.getId());
+ }
+ 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 getModiTime$(){
+ if (Cools.isEmpty(this.modiTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
+ }
+
+ public String getAppeTime$(){
+ if (Cools.isEmpty(this.appeTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/BasJarMastLogMapper.java b/src/main/java/com/zy/asrs/mapper/BasJarMastLogMapper.java
new file mode 100644
index 0000000..d2d5323
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasJarMastLogMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.BasJarMastLog;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasJarMastLogMapper extends BaseMapper<BasJarMastLog> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/BasJarMastLogService.java b/src/main/java/com/zy/asrs/service/BasJarMastLogService.java
new file mode 100644
index 0000000..1febc59
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasJarMastLogService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.BasJarMastLog;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface BasJarMastLogService extends IService<BasJarMastLog> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasJarMastLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasJarMastLogServiceImpl.java
new file mode 100644
index 0000000..13bccf0
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasJarMastLogServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.BasJarMastLogMapper;
+import com.zy.asrs.entity.BasJarMastLog;
+import com.zy.asrs.service.BasJarMastLogService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("basJarMastLogService")
+public class BasJarMastLogServiceImpl extends ServiceImpl<BasJarMastLogMapper, BasJarMastLog> implements BasJarMastLogService {
+
+}
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index 59dd6a5..52b0b30 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_crn_log";
+ generator.table="asr_bas_jar_mast_log";
generator.packagePath="com.zy.asrs";
generator.build();
}
diff --git a/src/main/resources/mapper/BasJarMastLogMapper.xml b/src/main/resources/mapper/BasJarMastLogMapper.xml
new file mode 100644
index 0000000..58bb8df
--- /dev/null
+++ b/src/main/resources/mapper/BasJarMastLogMapper.xml
@@ -0,0 +1,26 @@
+<?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.BasJarMastLogMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasJarMastLog">
+ <id column="id" property="id" />
+ <result column="wrk_no" property="wrkNo" />
+ <result column="enter_sta_no" property="enterStaNo" />
+ <result column="out_sta_no" property="outStaNo" />
+ <result column="jar_enter_sta_no" property="jarEnterStaNo" />
+ <result column="jar_out_sta_no" property="jarOutStaNo" />
+ <result column="jar_id" property="jarId" />
+ <result column="jar_regin" property="jarRegin" />
+ <result column="status" property="status" />
+ <result column="enter_ste_no" property="enterSteNo" />
+ <result column="out_ste_id" property="outSteId" />
+ <result column="enter_rgv_id" property="enterRgvId" />
+ <result column="out_rgv_id" property="outRgvId" />
+ <result column="io_time" property="ioTime" />
+ <result column="modi_time" property="modiTime" />
+ <result column="appe_time" property="appeTime" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/basJarMastLog/basJarMastLog.js b/src/main/webapp/static/js/basJarMastLog/basJarMastLog.js
new file mode 100644
index 0000000..adea15a
--- /dev/null
+++ b/src/main/webapp/static/js/basJarMastLog/basJarMastLog.js
@@ -0,0 +1,275 @@
+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: '#basJarMastLog',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/basJarMastLog/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'id', align: 'center',title: 'ID'}
+ ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
+ ,{field: 'enterStaNo', align: 'center',title: '鍏ュ簱婧愮珯鐐�'}
+ ,{field: 'outStaNo', align: 'center',title: '鍏ュ簱鐩爣绔欑偣'}
+ ,{field: 'jarEnterStaNo', align: 'center',title: '鍏ョ～鍖栫綈绔欑偣'}
+ ,{field: 'jarOutStaNo', align: 'center',title: '鍑虹～鍖栫綈绔欑偣'}
+ ,{field: 'jarId', align: 'center',title: '纭寲缃怚D'}
+ ,{field: 'jarRegin', align: 'center',title: '鍖哄煙'}
+ ,{field: 'status$', align: 'center',title: '宸ヤ綔鐘舵��'}
+ ,{field: 'enterSteNo', align: 'center',title: '鍏ョ綈灏忚溅'}
+ ,{field: 'outSteId', align: 'center',title: '鍑虹綈灏忚溅'}
+ ,{field: 'enterRgvId', align: 'center',title: '鍏ョ綈RGV'}
+ ,{field: 'outRgvId', align: 'center',title: '鍑虹綈RGV'}
+ ,{field: 'ioTime$', align: 'center',title: '鍏ュ簱鏃堕棿'}
+ ,{field: 'modiTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
+ ,{field: 'appeTime$', align: 'center',title: '鏇存柊鏃堕棿'}
+
+ ,{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(basJarMastLog)', 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(basJarMastLog)', 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.id;
+ }));
+ 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 = {
+ 'basJarMastLog': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/basJarMastLog/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(basJarMastLog)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ del([data.id]);
+ 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+"/basJarMastLog/"+(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+"/basJarMastLog/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
+ });
+ layDate.render({
+ elem: '#appeTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['appeTime\\$']: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/basJarMastLog/basJarMastLog.html b/src/main/webapp/views/basJarMastLog/basJarMastLog.html
new file mode 100644
index 0000000..423cf0a
--- /dev/null
+++ b/src/main/webapp/views/basJarMastLog/basJarMastLog.html
@@ -0,0 +1,182 @@
+<!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="basJarMastLog" lay-filter="basJarMastLog"></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/basJarMastLog/basJarMastLog.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 layui-form-required">鍏ュ簱婧愮珯鐐�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="enterStaNo" 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="outStaNo" 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="jarEnterStaNo" 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="jarOutStaNo" placeholder="璇疯緭鍏ュ嚭纭寲缃愮珯鐐�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">纭寲缃怚D: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="jarId" placeholder="璇疯緭鍏ョ～鍖栫綈ID" 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="jarRegin" 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 cool-auto-complete">
+ <input class="layui-input" name="status" placeholder="璇疯緭鍏ュ伐浣滅姸鎬�" lay-vertype="tips" lay-verify="required" style="display: none">
+ <input id="status$" name="status$" 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="basJarMastStatusQueryBystatus" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basJarMastStatusQueryBystatusSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </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="enterSteNo" 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="outSteId" placeholder="璇疯緭鍏ュ嚭缃愬皬杞�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鍏ョ綈RGV: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="enterRgvId" placeholder="璇疯緭鍏ュ叆缃怰GV" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鍑虹綈RGV: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="outRgvId" placeholder="璇疯緭鍏ュ嚭缃怰GV" 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="ioTime" id="ioTime$" placeholder="璇疯緭鍏ュ叆搴撴椂闂�">
+ </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">鏇存柊鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="appeTime" id="appeTime$" placeholder="璇疯緭鍏ユ洿鏂版椂闂�">
+ </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>
+
diff --git a/src/main/webapp/views/deviceOperate/jarOperate.html b/src/main/webapp/views/deviceOperate/jarOperate.html
index bdae65b..bf94b37 100644
--- a/src/main/webapp/views/deviceOperate/jarOperate.html
+++ b/src/main/webapp/views/deviceOperate/jarOperate.html
@@ -36,8 +36,9 @@
<div style="width: 100%;display: flex;justify-content: center;margin-top: 10px;">
<div style="width: 55%;margin-right: 10px;">
<el-card class="box-card">
- <div slot="header" class="clearfix">
+ <div slot="header" class="clearfix" style="display: flex;justify-content: space-between;align-items: center">
<span>纭寲搴撲綅</span>
+ <el-button style="" type="primary" plain size="medium">鍘嗗彶浠诲姟</el-button>
</div>
<div v-if="currentIndex == null">
<el-empty description="璇烽�夋嫨璁惧"></el-empty>
--
Gitblit v1.9.1