From dbe87fddc43db7e5486489c3a011cc6474c4701c Mon Sep 17 00:00:00 2001 From: 1 <1> Date: 星期四, 09 十月 2025 16:46:42 +0800 Subject: [PATCH] #和得服务器 --- src/main/java/com/zy/asrs/service/impl/BasDevpOptServiceImpl.java | 12 src/main/resources/mapper/BasRgvOptMapper.xml | 28 src/main/java/com/zy/asrs/mapper/BasDevpOptMapper.java | 12 src/main/java/basRgvOpt.sql | 18 src/main/java/com/zy/common/CodeBuilder.java | 2 src/main/webapp/views/basRgvOpt/basRgvOpt.html | 198 ++++++ src/main/java/com/zy/asrs/controller/BasRgvOptController.java | 127 ++++ src/main/java/com/zy/asrs/service/BasDevpOptService.java | 8 src/main/java/com/zy/asrs/mapper/BasRgvOptMapper.java | 12 src/main/java/com/zy/asrs/entity/BasRgvOpt.java | 224 +++++++ src/main/webapp/static/js/basRgvOpt/basRgvOpt.js | 272 +++++++++ src/main/java/basDevpOpt.sql | 18 src/main/java/com/zy/asrs/controller/BasDevpOptController.java | 127 ++++ src/main/java/com/zy/asrs/entity/BasDevpOpt.java | 176 ++++++ src/main/webapp/static/js/basDevpOpt/basDevpOpt.js | 270 +++++++++ src/main/resources/mapper/BasDevpOptMapper.xml | 26 src/main/webapp/views/basDevpOpt/basDevpOpt.html | 180 ++++++ src/main/java/com/zy/asrs/service/BasRgvOptService.java | 8 src/main/java/com/zy/asrs/service/impl/BasRgvOptServiceImpl.java | 12 19 files changed, 1,729 insertions(+), 1 deletions(-) diff --git a/src/main/java/basDevpOpt.sql b/src/main/java/basDevpOpt.sql new file mode 100644 index 0000000..f0d5e54 --- /dev/null +++ b/src/main/java/basDevpOpt.sql @@ -0,0 +1,18 @@ +-- save basDevpOpt record +-- mysql +insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basDevpOpt/basDevpOpt.html', 'basDevpOpt绠$悊', null , '2', null , '1'); + +insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basDevpOpt#view', '鏌ヨ', '', '3', '0', '1'); +insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basDevpOpt#btn-add', '鏂板', '', '3', '1', '1'); +insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basDevpOpt#btn-edit', '缂栬緫', '', '3', '2', '1'); +insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basDevpOpt#btn-delete', '鍒犻櫎', '', '3', '3', '1'); +insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basDevpOpt#btn-export', '瀵煎嚭', '', '3', '4', '1'); + +-- sqlserver +insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basDevpOpt/basDevpOpt.html', N'basDevpOpt绠$悊', null, '2', null, '1'); + +insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basDevpOpt#view', N'鏌ヨ', '', '3', '0', '1'); +insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basDevpOpt#btn-add', N'鏂板', '', '3', '1', '1'); +insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basDevpOpt#btn-edit', N'缂栬緫', '', '3', '2', '1'); +insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basDevpOpt#btn-delete', N'鍒犻櫎', '', '3', '3', '1'); +insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basDevpOpt#btn-export', N'瀵煎嚭', '', '3', '4', '1'); diff --git a/src/main/java/basRgvOpt.sql b/src/main/java/basRgvOpt.sql new file mode 100644 index 0000000..b36d19d --- /dev/null +++ b/src/main/java/basRgvOpt.sql @@ -0,0 +1,18 @@ +-- save basRgvOpt record +-- mysql +insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basRgvOpt/basRgvOpt.html', 'basRgvOpt绠$悊', null , '2', null , '1'); + +insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basRgvOpt#view', '鏌ヨ', '', '3', '0', '1'); +insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basRgvOpt#btn-add', '鏂板', '', '3', '1', '1'); +insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basRgvOpt#btn-edit', '缂栬緫', '', '3', '2', '1'); +insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basRgvOpt#btn-delete', '鍒犻櫎', '', '3', '3', '1'); +insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basRgvOpt#btn-export', '瀵煎嚭', '', '3', '4', '1'); + +-- sqlserver +insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basRgvOpt/basRgvOpt.html', N'basRgvOpt绠$悊', null, '2', null, '1'); + +insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basRgvOpt#view', N'鏌ヨ', '', '3', '0', '1'); +insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basRgvOpt#btn-add', N'鏂板', '', '3', '1', '1'); +insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basRgvOpt#btn-edit', N'缂栬緫', '', '3', '2', '1'); +insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basRgvOpt#btn-delete', N'鍒犻櫎', '', '3', '3', '1'); +insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basRgvOpt#btn-export', N'瀵煎嚭', '', '3', '4', '1'); diff --git a/src/main/java/com/zy/asrs/controller/BasDevpOptController.java b/src/main/java/com/zy/asrs/controller/BasDevpOptController.java new file mode 100644 index 0000000..3ea47b0 --- /dev/null +++ b/src/main/java/com/zy/asrs/controller/BasDevpOptController.java @@ -0,0 +1,127 @@ +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.BasDevpOpt; +import com.zy.asrs.service.BasDevpOptService; +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 BasDevpOptController extends BaseController { + + @Autowired + private BasDevpOptService basDevpOptService; + + @RequestMapping(value = "/basDevpOpt/{id}/auth") + @ManagerAuth + public R get(@PathVariable("id") String id) { + return R.ok(basDevpOptService.selectById(String.valueOf(id))); + } + + @RequestMapping(value = "/basDevpOpt/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<BasDevpOpt> wrapper = new EntityWrapper<>(); + excludeTrash(param); + convert(param, wrapper); + allLike(BasDevpOpt.class, param.keySet(), wrapper, condition); + if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else { + wrapper.orderBy("send_time", false); + } + return R.ok(basDevpOptService.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 = "/basDevpOpt/add/auth") + @ManagerAuth + public R add(BasDevpOpt basDevpOpt) { + basDevpOptService.insert(basDevpOpt); + return R.ok(); + } + + @RequestMapping(value = "/basDevpOpt/update/auth") + @ManagerAuth + public R update(BasDevpOpt basDevpOpt){ + if (Cools.isEmpty(basDevpOpt) || null==basDevpOpt.getId()){ + return R.error(); + } + basDevpOptService.updateById(basDevpOpt); + return R.ok(); + } + + @RequestMapping(value = "/basDevpOpt/delete/auth") + @ManagerAuth + public R delete(@RequestParam(value="ids[]") Long[] ids){ + for (Long id : ids){ + basDevpOptService.deleteById(id); + } + return R.ok(); + } + + @RequestMapping(value = "/basDevpOpt/export/auth") + @ManagerAuth + public R export(@RequestBody JSONObject param){ + EntityWrapper<BasDevpOpt> wrapper = new EntityWrapper<>(); + List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); + Map<String, Object> map = excludeTrash(param.getJSONObject("basDevpOpt")); + convert(map, wrapper); + List<BasDevpOpt> list = basDevpOptService.selectList(wrapper); + return R.ok(exportSupport(list, fields)); + } + + @RequestMapping(value = "/basDevpOptQuery/auth") + @ManagerAuth + public R query(String condition) { + EntityWrapper<BasDevpOpt> wrapper = new EntityWrapper<>(); + wrapper.like("id", condition); + Page<BasDevpOpt> page = basDevpOptService.selectPage(new Page<>(0, 10), wrapper); + List<Map<String, Object>> result = new ArrayList<>(); + for (BasDevpOpt basDevpOpt : page.getRecords()){ + Map<String, Object> map = new HashMap<>(); + map.put("id", basDevpOpt.getId()); + map.put("value", basDevpOpt.getId()); + result.add(map); + } + return R.ok(result); + } + + @RequestMapping(value = "/basDevpOpt/check/column/auth") + @ManagerAuth + public R query(@RequestBody JSONObject param) { + Wrapper<BasDevpOpt> wrapper = new EntityWrapper<BasDevpOpt>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val")); + if (null != basDevpOptService.selectOne(wrapper)){ + return R.parse(BaseRes.REPEAT).add(getComment(BasDevpOpt.class, String.valueOf(param.get("key")))); + } + return R.ok(); + } + +} diff --git a/src/main/java/com/zy/asrs/controller/BasRgvOptController.java b/src/main/java/com/zy/asrs/controller/BasRgvOptController.java new file mode 100644 index 0000000..0da2c8f --- /dev/null +++ b/src/main/java/com/zy/asrs/controller/BasRgvOptController.java @@ -0,0 +1,127 @@ +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.BasRgvOpt; +import com.zy.asrs.service.BasRgvOptService; +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 BasRgvOptController extends BaseController { + + @Autowired + private BasRgvOptService basRgvOptService; + + @RequestMapping(value = "/basRgvOpt/{id}/auth") + @ManagerAuth + public R get(@PathVariable("id") String id) { + return R.ok(basRgvOptService.selectById(String.valueOf(id))); + } + + @RequestMapping(value = "/basRgvOpt/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<BasRgvOpt> wrapper = new EntityWrapper<>(); + excludeTrash(param); + convert(param, wrapper); + allLike(BasRgvOpt.class, param.keySet(), wrapper, condition); + if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else { + wrapper.orderBy("send_time", false); + } + return R.ok(basRgvOptService.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 = "/basRgvOpt/add/auth") + @ManagerAuth + public R add(BasRgvOpt basRgvOpt) { + basRgvOptService.insert(basRgvOpt); + return R.ok(); + } + + @RequestMapping(value = "/basRgvOpt/update/auth") + @ManagerAuth + public R update(BasRgvOpt basRgvOpt){ + if (Cools.isEmpty(basRgvOpt) || null==basRgvOpt.getId()){ + return R.error(); + } + basRgvOptService.updateById(basRgvOpt); + return R.ok(); + } + + @RequestMapping(value = "/basRgvOpt/delete/auth") + @ManagerAuth + public R delete(@RequestParam(value="ids[]") Long[] ids){ + for (Long id : ids){ + basRgvOptService.deleteById(id); + } + return R.ok(); + } + + @RequestMapping(value = "/basRgvOpt/export/auth") + @ManagerAuth + public R export(@RequestBody JSONObject param){ + EntityWrapper<BasRgvOpt> wrapper = new EntityWrapper<>(); + List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); + Map<String, Object> map = excludeTrash(param.getJSONObject("basRgvOpt")); + convert(map, wrapper); + List<BasRgvOpt> list = basRgvOptService.selectList(wrapper); + return R.ok(exportSupport(list, fields)); + } + + @RequestMapping(value = "/basRgvOptQuery/auth") + @ManagerAuth + public R query(String condition) { + EntityWrapper<BasRgvOpt> wrapper = new EntityWrapper<>(); + wrapper.like("id", condition); + Page<BasRgvOpt> page = basRgvOptService.selectPage(new Page<>(0, 10), wrapper); + List<Map<String, Object>> result = new ArrayList<>(); + for (BasRgvOpt basRgvOpt : page.getRecords()){ + Map<String, Object> map = new HashMap<>(); + map.put("id", basRgvOpt.getId()); + map.put("value", basRgvOpt.getId()); + result.add(map); + } + return R.ok(result); + } + + @RequestMapping(value = "/basRgvOpt/check/column/auth") + @ManagerAuth + public R query(@RequestBody JSONObject param) { + Wrapper<BasRgvOpt> wrapper = new EntityWrapper<BasRgvOpt>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val")); + if (null != basRgvOptService.selectOne(wrapper)){ + return R.parse(BaseRes.REPEAT).add(getComment(BasRgvOpt.class, String.valueOf(param.get("key")))); + } + return R.ok(); + } + +} diff --git a/src/main/java/com/zy/asrs/entity/BasDevpOpt.java b/src/main/java/com/zy/asrs/entity/BasDevpOpt.java new file mode 100644 index 0000000..10e9139 --- /dev/null +++ b/src/main/java/com/zy/asrs/entity/BasDevpOpt.java @@ -0,0 +1,176 @@ +package com.zy.asrs.entity; + +import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField; +import java.text.SimpleDateFormat; +import java.util.Date; +import org.springframework.format.annotation.DateTimeFormat; +import java.text.SimpleDateFormat; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.enums.IdType; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +@Data +@TableName("asr_bas_devp_opt") +public class BasDevpOpt implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 浠诲姟鍙� + */ + @ApiModelProperty(value= "浠诲姟鍙�") + @TableField("wrk_no") + private Integer wrkNo; + + /** + * 涓嬪彂鏃堕棿 + */ + @ApiModelProperty(value= "涓嬪彂鏃堕棿") + @TableField("send_time") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date sendTime; + + /** + * 婧愮珯 + */ + @ApiModelProperty(value= "婧愮珯") + @TableField("source_sta") + private Integer sourceSta; + + /** + * 鐩爣绔� + */ + @ApiModelProperty(value= "鐩爣绔�") + @TableField("pos_sta") + private Integer posSta; + + /** + * 鍝嶅簲缁撴灉 1: 姝e父 0: 澶辫触 + */ + @ApiModelProperty(value= "鍝嶅簲缁撴灉 1: 姝e父 0: 澶辫触 ") + private Integer response; + + /** + * 淇敼鏃堕棿 + */ + @ApiModelProperty(value= "淇敼鏃堕棿") + @TableField("update_time") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + /** + * 婧愮珯鏈夌墿鐘舵�� + */ + @ApiModelProperty(value= "婧愮珯鏈夌墿鐘舵��") + @TableField("source_loading") + private String sourceLoading; + + /** + * 鐩爣绔欐湁鐗╃姸鎬� + */ + @ApiModelProperty(value= "鐩爣绔欐湁鐗╃姸鎬�") + @TableField("pos_loading") + private String posLoading; + + @ApiModelProperty(value= "") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value= "") + private String barcode; + + @ApiModelProperty(value= "") + @TableField("front_err") + private Long frontErr; + + @ApiModelProperty(value= "") + @TableField("back_err") + private Long backErr; + + @ApiModelProperty(value= "") + @TableField("high_err") + private Long highErr; + + @ApiModelProperty(value= "") + @TableField("left_err") + private Long leftErr; + + @ApiModelProperty(value= "") + @TableField("right_err") + private Long rightErr; + + @ApiModelProperty(value= "") + @TableField("barcode_err") + private Long barcodeErr; + + public BasDevpOpt() {} + + public BasDevpOpt(Integer wrkNo,Date sendTime,Integer sourceSta,Integer posSta,Integer response,Date updateTime,String sourceLoading,String posLoading,String barcode,Long frontErr,Long backErr,Long highErr,Long leftErr,Long rightErr,Long barcodeErr) { + this.wrkNo = wrkNo; + this.sendTime = sendTime; + this.sourceSta = sourceSta; + this.posSta = posSta; + this.response = response; + this.updateTime = updateTime; + this.sourceLoading = sourceLoading; + this.posLoading = posLoading; + this.barcode = barcode; + this.frontErr = frontErr; + this.backErr = backErr; + this.highErr = highErr; + this.leftErr = leftErr; + this.rightErr = rightErr; + this.barcodeErr = barcodeErr; + } + +// BasDevpOpt basDevpOpt = new BasDevpOpt( +// null, // 浠诲姟鍙� +// null, // 涓嬪彂鏃堕棿 +// null, // 婧愮珯 +// null, // 鐩爣绔� +// null, // 鍝嶅簲缁撴灉 +// null, // 淇敼鏃堕棿 +// null, // 婧愮珯鏈夌墿鐘舵�� +// null, // 鐩爣绔欐湁鐗╃姸鎬� +// null, // +// null, // +// null, // +// null, // +// null, // +// null, // +// null // +// ); + + public String getSendTime$(){ + if (Cools.isEmpty(this.sendTime)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.sendTime); + } + + public String getResponse$(){ + if (null == this.response){ return null; } + switch (this.response){ + case 1: + return "姝e父"; + case 0: + return "澶辫触"; + default: + return String.valueOf(this.response); + } + } + + public String getUpdateTime$(){ + if (Cools.isEmpty(this.updateTime)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime); + } + + +} diff --git a/src/main/java/com/zy/asrs/entity/BasRgvOpt.java b/src/main/java/com/zy/asrs/entity/BasRgvOpt.java new file mode 100644 index 0000000..546a8a0 --- /dev/null +++ b/src/main/java/com/zy/asrs/entity/BasRgvOpt.java @@ -0,0 +1,224 @@ +package com.zy.asrs.entity; + +import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField; +import java.text.SimpleDateFormat; +import java.util.Date; +import org.springframework.format.annotation.DateTimeFormat; +import java.text.SimpleDateFormat; +import java.util.Date; +import com.core.common.SpringUtils; +import com.zy.system.service.UserService; +import com.zy.system.entity.User; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.enums.IdType; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +@Data +@TableName("asr_bas_rgv_opt") +public class BasRgvOpt implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 浠诲姟鍙� + */ + @ApiModelProperty(value= "浠诲姟鍙�") + @TableField("wrk_no1") + private Integer wrkNo1; + + @ApiModelProperty(value= "") + @TableField("wrk_no2") + private Integer wrkNo2; + + /** + * 绌挎杞� + */ + @ApiModelProperty(value= "绌挎杞�") + @TableField("rgv_no") + private Integer rgvNo; + + /** + * 涓嬪彂鏃堕棿 + */ + @ApiModelProperty(value= "涓嬪彂鏃堕棿") + @TableField("send_time") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date sendTime; + + /** + * 浣滀笟 + */ + @ApiModelProperty(value= "浣滀笟") + private String mode; + + /** + * 婧愭帓 + */ + @ApiModelProperty(value= "婧愭帓") + @TableField("source_row") + private Integer sourceRow; + + /** + * 婧愬垪 + */ + @ApiModelProperty(value= "婧愬垪") + @TableField("source_bay") + private Integer sourceBay; + + /** + * 婧愬眰 + */ + @ApiModelProperty(value= "婧愬眰") + @TableField("source_lev") + private Integer sourceLev; + + /** + * 婧愮珯 + */ + @ApiModelProperty(value= "婧愮珯") + @TableField("source_sta") + private Integer sourceSta; + + /** + * 鐩爣鎺� + */ + @ApiModelProperty(value= "鐩爣鎺�") + @TableField("pos_row") + private Integer posRow; + + /** + * 鐩爣鍒� + */ + @ApiModelProperty(value= "鐩爣鍒�") + @TableField("pos_bay") + private Integer posBay; + + /** + * 鐩爣灞� + */ + @ApiModelProperty(value= "鐩爣灞�") + @TableField("pos_lev") + private Integer posLev; + + /** + * 鐩爣绔� + */ + @ApiModelProperty(value= "鐩爣绔�") + @TableField("pos_sta") + private Integer posSta; + + /** + * 鍝嶅簲缁撴灉 1: 姝e父 0: 澶辫触 + */ + @ApiModelProperty(value= "鍝嶅簲缁撴灉 1: 姝e父 0: 澶辫触 ") + private Integer response; + + /** + * 淇敼鏃堕棿 + */ + @ApiModelProperty(value= "淇敼鏃堕棿") + @TableField("update_time") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + /** + * 淇敼浜哄憳 + */ + @ApiModelProperty(value= "淇敼浜哄憳") + @TableField("update_by") + private Long updateBy; + + /** + * 澶囨敞 + */ + @ApiModelProperty(value= "澶囨敞") + private String memo; + + @ApiModelProperty(value= "") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + public BasRgvOpt() {} + + public BasRgvOpt(Integer wrkNo1,Integer wrkNo2,Integer rgvNo,Date sendTime,String mode,Integer sourceRow,Integer sourceBay,Integer sourceLev,Integer sourceSta,Integer posRow,Integer posBay,Integer posLev,Integer posSta,Integer response,Date updateTime,Long updateBy,String memo) { + this.wrkNo1 = wrkNo1; + this.wrkNo2 = wrkNo2; + this.rgvNo = rgvNo; + this.sendTime = sendTime; + this.mode = mode; + this.sourceRow = sourceRow; + this.sourceBay = sourceBay; + this.sourceLev = sourceLev; + this.sourceSta = sourceSta; + this.posRow = posRow; + this.posBay = posBay; + this.posLev = posLev; + this.posSta = posSta; + this.response = response; + this.updateTime = updateTime; + this.updateBy = updateBy; + this.memo = memo; + } + +// BasRgvOpt basRgvOpt = new BasRgvOpt( +// null, // 浠诲姟鍙� +// null, // +// null, // 绌挎杞� +// null, // 涓嬪彂鏃堕棿 +// null, // 浣滀笟 +// null, // 婧愭帓 +// null, // 婧愬垪 +// null, // 婧愬眰 +// null, // 婧愮珯 +// null, // 鐩爣鎺� +// null, // 鐩爣鍒� +// null, // 鐩爣灞� +// null, // 鐩爣绔� +// null, // 鍝嶅簲缁撴灉 +// null, // 淇敼鏃堕棿 +// null, // 淇敼浜哄憳 +// null, // 澶囨敞 + +// ); + + public String getSendTime$(){ + if (Cools.isEmpty(this.sendTime)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.sendTime); + } + + public String getResponse$(){ + if (null == this.response){ return null; } + switch (this.response){ + case 1: + return "姝e父"; + case 0: + return "澶辫触"; + default: + return String.valueOf(this.response); + } + } + + public String getUpdateTime$(){ + if (Cools.isEmpty(this.updateTime)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime); + } + + public String getUpdateBy$(){ + UserService service = SpringUtils.getBean(UserService.class); + User user = service.selectById(this.updateBy); + if (!Cools.isEmpty(user)){ + return String.valueOf(user.getNickname()); + } + return null; + } + + +} diff --git a/src/main/java/com/zy/asrs/mapper/BasDevpOptMapper.java b/src/main/java/com/zy/asrs/mapper/BasDevpOptMapper.java new file mode 100644 index 0000000..9d835ab --- /dev/null +++ b/src/main/java/com/zy/asrs/mapper/BasDevpOptMapper.java @@ -0,0 +1,12 @@ +package com.zy.asrs.mapper; + +import com.zy.asrs.entity.BasDevpOpt; +import com.baomidou.mybatisplus.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +@Mapper +@Repository +public interface BasDevpOptMapper extends BaseMapper<BasDevpOpt> { + +} diff --git a/src/main/java/com/zy/asrs/mapper/BasRgvOptMapper.java b/src/main/java/com/zy/asrs/mapper/BasRgvOptMapper.java new file mode 100644 index 0000000..b8622e4 --- /dev/null +++ b/src/main/java/com/zy/asrs/mapper/BasRgvOptMapper.java @@ -0,0 +1,12 @@ +package com.zy.asrs.mapper; + +import com.zy.asrs.entity.BasRgvOpt; +import com.baomidou.mybatisplus.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +@Mapper +@Repository +public interface BasRgvOptMapper extends BaseMapper<BasRgvOpt> { + +} diff --git a/src/main/java/com/zy/asrs/service/BasDevpOptService.java b/src/main/java/com/zy/asrs/service/BasDevpOptService.java new file mode 100644 index 0000000..13d23b7 --- /dev/null +++ b/src/main/java/com/zy/asrs/service/BasDevpOptService.java @@ -0,0 +1,8 @@ +package com.zy.asrs.service; + +import com.zy.asrs.entity.BasDevpOpt; +import com.baomidou.mybatisplus.service.IService; + +public interface BasDevpOptService extends IService<BasDevpOpt> { + +} diff --git a/src/main/java/com/zy/asrs/service/BasRgvOptService.java b/src/main/java/com/zy/asrs/service/BasRgvOptService.java new file mode 100644 index 0000000..cd3edcb --- /dev/null +++ b/src/main/java/com/zy/asrs/service/BasRgvOptService.java @@ -0,0 +1,8 @@ +package com.zy.asrs.service; + +import com.zy.asrs.entity.BasRgvOpt; +import com.baomidou.mybatisplus.service.IService; + +public interface BasRgvOptService extends IService<BasRgvOpt> { + +} diff --git a/src/main/java/com/zy/asrs/service/impl/BasDevpOptServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDevpOptServiceImpl.java new file mode 100644 index 0000000..9f7d39c --- /dev/null +++ b/src/main/java/com/zy/asrs/service/impl/BasDevpOptServiceImpl.java @@ -0,0 +1,12 @@ +package com.zy.asrs.service.impl; + +import com.zy.asrs.mapper.BasDevpOptMapper; +import com.zy.asrs.entity.BasDevpOpt; +import com.zy.asrs.service.BasDevpOptService; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +@Service("basDevpOptService") +public class BasDevpOptServiceImpl extends ServiceImpl<BasDevpOptMapper, BasDevpOpt> implements BasDevpOptService { + +} diff --git a/src/main/java/com/zy/asrs/service/impl/BasRgvOptServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasRgvOptServiceImpl.java new file mode 100644 index 0000000..3d6d2a8 --- /dev/null +++ b/src/main/java/com/zy/asrs/service/impl/BasRgvOptServiceImpl.java @@ -0,0 +1,12 @@ +package com.zy.asrs.service.impl; + +import com.zy.asrs.mapper.BasRgvOptMapper; +import com.zy.asrs.entity.BasRgvOpt; +import com.zy.asrs.service.BasRgvOptService; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +@Service("basRgvOptService") +public class BasRgvOptServiceImpl extends ServiceImpl<BasRgvOptMapper, BasRgvOpt> implements BasRgvOptService { + +} diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java index 9e65c97..db535ce 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="10.10.10.235:1433;databasename=jshdasrs"; generator.username="sa"; generator.password="sa@123"; - generator.table="asr_bas_arm_mast_sign"; + generator.table="asr_bas_rgv_opt"; generator.packagePath="com.zy.asrs"; generator.build(); } diff --git a/src/main/resources/mapper/BasDevpOptMapper.xml b/src/main/resources/mapper/BasDevpOptMapper.xml new file mode 100644 index 0000000..26f9d6f --- /dev/null +++ b/src/main/resources/mapper/BasDevpOptMapper.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.BasDevpOptMapper"> + + <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> + <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasDevpOpt"> + <result column="wrk_no" property="wrkNo" /> + <result column="send_time" property="sendTime" /> + <result column="source_sta" property="sourceSta" /> + <result column="pos_sta" property="posSta" /> + <result column="response" property="response" /> + <result column="update_time" property="updateTime" /> + <result column="source_loading" property="sourceLoading" /> + <result column="pos_loading" property="posLoading" /> + <result column="id" property="id" /> + <result column="barcode" property="barcode" /> + <result column="front_err" property="frontErr" /> + <result column="back_err" property="backErr" /> + <result column="high_err" property="highErr" /> + <result column="left_err" property="leftErr" /> + <result column="right_err" property="rightErr" /> + <result column="barcode_err" property="barcodeErr" /> + + </resultMap> + +</mapper> diff --git a/src/main/resources/mapper/BasRgvOptMapper.xml b/src/main/resources/mapper/BasRgvOptMapper.xml new file mode 100644 index 0000000..83bc030 --- /dev/null +++ b/src/main/resources/mapper/BasRgvOptMapper.xml @@ -0,0 +1,28 @@ +<?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.BasRgvOptMapper"> + + <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> + <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasRgvOpt"> + <result column="wrk_no1" property="wrkNo1" /> + <result column="wrk_no2" property="wrkNo2" /> + <result column="rgv_no" property="rgvNo" /> + <result column="send_time" property="sendTime" /> + <result column="mode" property="mode" /> + <result column="source_row" property="sourceRow" /> + <result column="source_bay" property="sourceBay" /> + <result column="source_lev" property="sourceLev" /> + <result column="source_sta" property="sourceSta" /> + <result column="pos_row" property="posRow" /> + <result column="pos_bay" property="posBay" /> + <result column="pos_lev" property="posLev" /> + <result column="pos_sta" property="posSta" /> + <result column="response" property="response" /> + <result column="update_time" property="updateTime" /> + <result column="update_by" property="updateBy" /> + <result column="memo" property="memo" /> + <result column="id" property="id" /> + + </resultMap> + +</mapper> diff --git a/src/main/webapp/static/js/basDevpOpt/basDevpOpt.js b/src/main/webapp/static/js/basDevpOpt/basDevpOpt.js new file mode 100644 index 0000000..7b8e4dc --- /dev/null +++ b/src/main/webapp/static/js/basDevpOpt/basDevpOpt.js @@ -0,0 +1,270 @@ +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: '#basDevpOpt', + headers: {token: localStorage.getItem('token')}, + url: baseUrl+'/basDevpOpt/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: 'sendTime$', align: 'center',title: '涓嬪彂鏃堕棿'} + ,{field: 'sourceSta', align: 'center',title: '婧愮珯'} + ,{field: 'posSta', align: 'center',title: '鐩爣绔�'} + // ,{field: 'response$', align: 'center',title: '鍝嶅簲缁撴灉'} + // ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'} + ,{field: 'sourceLoading', align: 'center',title: '婧愮珯鏈夌墿鐘舵��'} + // ,{field: 'posLoading', align: 'center',title: '鐩爣绔欐湁鐗╃姸鎬�'} + // ,{field: 'id', align: 'center',title: ''} + ,{field: 'barcode', align: 'center',title: '鏉$爜鍊�'} + ,{field: 'frontErr', align: 'center',title: '鍓嶈秴闄�'} + ,{field: 'backErr', align: 'center',title: '鍚庤秴闄�'} + ,{field: 'highErr', align: 'center',title: '楂樿秴闄�'} + ,{field: 'leftErr', align: 'center',title: '宸﹁秴闄�'} + ,{field: 'rightErr', align: 'center',title: '鍙宠秴闄�'} + ,{field: 'barcodeErr', 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(basDevpOpt)', 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(basDevpOpt)', 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 = { + 'basDevpOpt': exportData, + 'fields': fields + }; + $.ajax({ + url: baseUrl+"/basDevpOpt/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(basDevpOpt)', 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+"/basDevpOpt/"+(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+"/basDevpOpt/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: '#sendTime\\$', + type: 'datetime', + value: data!==undefined?data['sendTime\\$']:null + }); + layDate.render({ + elem: '#updateTime\\$', + type: 'datetime', + value: data!==undefined?data['updateTime\\$']: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/static/js/basRgvOpt/basRgvOpt.js b/src/main/webapp/static/js/basRgvOpt/basRgvOpt.js new file mode 100644 index 0000000..622f817 --- /dev/null +++ b/src/main/webapp/static/js/basRgvOpt/basRgvOpt.js @@ -0,0 +1,272 @@ +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: '#basRgvOpt', + headers: {token: localStorage.getItem('token')}, + url: baseUrl+'/basRgvOpt/list/auth', + page: true, + limit: 15, + limits: [15, 30, 50, 100, 200, 500], + toolbar: '#toolbar', + cellMinWidth: 50, + height: 'full-120', + cols: [[ + {type: 'checkbox'} + ,{field: 'wrkNo1', align: 'center',title: '浠诲姟鍙�'} + // ,{field: 'wrkNo2', align: 'center',title: ''} + ,{field: 'rgvNo', align: 'center',title: 'rgv缂栧彿'} + ,{field: 'sendTime$', align: 'center',title: '涓嬪彂鏃堕棿'} + ,{field: 'mode', align: 'center',title: '浣滀笟妯″紡'} + // ,{field: 'sourceRow', align: 'center',title: '婧愭帓'} + // ,{field: 'sourceBay', align: 'center',title: '婧愬垪'} + // ,{field: 'sourceLev', align: 'center',title: '婧愬眰'} + ,{field: 'sourceSta', align: 'center',title: '鐩爣绔�'} + // ,{field: 'posRow', align: 'center',title: '鐩爣鎺�'} + // ,{field: 'posBay', align: 'center',title: '鐩爣鍒�'} + // ,{field: 'posLev', align: 'center',title: '鐩爣灞�'} + ,{field: 'posSta', align: 'center',title: '鎵ц宸ヤ綅'} + // ,{field: 'response$', align: 'center',title: '鍝嶅簲缁撴灉'} + ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'} + // ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'} + ,{field: 'memo', align: 'center',title: '澶囨敞'} + // ,{field: 'id', 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(basRgvOpt)', 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(basRgvOpt)', 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 = { + 'basRgvOpt': exportData, + 'fields': fields + }; + $.ajax({ + url: baseUrl+"/basRgvOpt/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(basRgvOpt)', 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+"/basRgvOpt/"+(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+"/basRgvOpt/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: '#sendTime\\$', + type: 'datetime', + value: data!==undefined?data['sendTime\\$']:null + }); + layDate.render({ + elem: '#updateTime\\$', + type: 'datetime', + value: data!==undefined?data['updateTime\\$']: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/basDevpOpt/basDevpOpt.html b/src/main/webapp/views/basDevpOpt/basDevpOpt.html new file mode 100644 index 0000000..773d5f8 --- /dev/null +++ b/src/main/webapp/views/basDevpOpt/basDevpOpt.html @@ -0,0 +1,180 @@ +<!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="basDevpOpt" lay-filter="basDevpOpt"></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/basDevpOpt/basDevpOpt.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">浠诲姟鍙�: </label> + <div class="layui-input-block"> + <input class="layui-input" name="wrkNo" placeholder="璇疯緭鍏ヤ换鍔″彿"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">涓嬪彂鏃堕棿: </label> + <div class="layui-input-block"> + <input class="layui-input" name="sendTime" id="sendTime$" placeholder="璇疯緭鍏ヤ笅鍙戞椂闂�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">婧愮珯: </label> + <div class="layui-input-block"> + <input class="layui-input" name="sourceSta" placeholder="璇疯緭鍏ユ簮绔�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鐩爣绔�: </label> + <div class="layui-input-block"> + <input class="layui-input" name="posSta" placeholder="璇疯緭鍏ョ洰鏍囩珯"> + </div> + </div> +<!-- <div class="layui-form-item">--> +<!-- <label class="layui-form-label">鍝嶅簲缁撴灉: </label>--> +<!-- <div class="layui-input-block">--> +<!-- <select name="response">--> +<!-- <option value="">璇烽�夋嫨鍝嶅簲缁撴灉</option>--> +<!-- <option value="1">姝e父</option>--> +<!-- <option value="0">澶辫触</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="璇疯緭鍏ヤ慨鏀规椂闂�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">婧愮珯鏈夌墿鐘舵��: </label> + <div class="layui-input-block"> + <input class="layui-input" name="sourceLoading" placeholder="璇疯緭鍏ユ簮绔欐湁鐗╃姸鎬�"> + </div> + </div> +<!-- <div class="layui-form-item">--> +<!-- <label class="layui-form-label">鐩爣绔欐湁鐗╃姸鎬�: </label>--> +<!-- <div class="layui-input-block">--> +<!-- <input class="layui-input" name="posLoading" placeholder="璇疯緭鍏ョ洰鏍囩珯鏈夌墿鐘舵��">--> +<!-- </div>--> +<!-- </div>--> + <div class="layui-form-item"> + <label class="layui-form-label">: 鏉$爜</label> + <div class="layui-input-block"> + <input class="layui-input" name="barcode" placeholder="璇疯緭鍏�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">:鍓嶈秴闄� </label> + <div class="layui-input-block"> + <input class="layui-input" name="frontErr" placeholder="璇疯緭鍏�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">: 鍚庤秴闄�</label> + <div class="layui-input-block"> + <input class="layui-input" name="backErr" placeholder="璇疯緭鍏�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">: 楂樿秴闄�</label> + <div class="layui-input-block"> + <input class="layui-input" name="highErr" placeholder="璇疯緭鍏�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">:宸﹁秴闄� </label> + <div class="layui-input-block"> + <input class="layui-input" name="leftErr" placeholder="璇疯緭鍏�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">: 鍙宠秴闄�</label> + <div class="layui-input-block"> + <input class="layui-input" name="rightErr" placeholder="璇疯緭鍏�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">: 鎵爜澶辫触</label> + <div class="layui-input-block"> + <input class="layui-input" name="barcodeErr" 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/basRgvOpt/basRgvOpt.html b/src/main/webapp/views/basRgvOpt/basRgvOpt.html new file mode 100644 index 0000000..bd79047 --- /dev/null +++ b/src/main/webapp/views/basRgvOpt/basRgvOpt.html @@ -0,0 +1,198 @@ +<!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="basRgvOpt" lay-filter="basRgvOpt"></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/basRgvOpt/basRgvOpt.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">浠诲姟鍙�: </label> + <div class="layui-input-block"> + <input class="layui-input" name="wrkNo1" placeholder="璇疯緭鍏ヤ换鍔″彿"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">: </label> + <div class="layui-input-block"> + <input class="layui-input" name="wrkNo2" placeholder="璇疯緭鍏�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">绌挎杞�: </label> + <div class="layui-input-block"> + <input class="layui-input" name="rgvNo" placeholder="璇疯緭鍏ョ┛姊溅"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">涓嬪彂鏃堕棿: </label> + <div class="layui-input-block"> + <input class="layui-input" name="sendTime" id="sendTime$" placeholder="璇疯緭鍏ヤ笅鍙戞椂闂�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">浣滀笟: </label> + <div class="layui-input-block"> + <input class="layui-input" name="mode" placeholder="璇疯緭鍏ヤ綔涓�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">婧愭帓: </label> + <div class="layui-input-block"> + <input class="layui-input" name="sourceRow" placeholder="璇疯緭鍏ユ簮鎺�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">婧愬垪: </label> + <div class="layui-input-block"> + <input class="layui-input" name="sourceBay" placeholder="璇疯緭鍏ユ簮鍒�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">婧愬眰: </label> + <div class="layui-input-block"> + <input class="layui-input" name="sourceLev" placeholder="璇疯緭鍏ユ簮灞�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">婧愮珯: </label> + <div class="layui-input-block"> + <input class="layui-input" name="sourceSta" placeholder="璇疯緭鍏ユ簮绔�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鐩爣鎺�: </label> + <div class="layui-input-block"> + <input class="layui-input" name="posRow" placeholder="璇疯緭鍏ョ洰鏍囨帓"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鐩爣鍒�: </label> + <div class="layui-input-block"> + <input class="layui-input" name="posBay" placeholder="璇疯緭鍏ョ洰鏍囧垪"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鐩爣灞�: </label> + <div class="layui-input-block"> + <input class="layui-input" name="posLev" placeholder="璇疯緭鍏ョ洰鏍囧眰"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鐩爣绔�: </label> + <div class="layui-input-block"> + <input class="layui-input" name="posSta" placeholder="璇疯緭鍏ョ洰鏍囩珯"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鍝嶅簲缁撴灉: </label> + <div class="layui-input-block"> + <select name="response"> + <option value="">璇烽�夋嫨鍝嶅簲缁撴灉</option> + <option value="1">姝e父</option> + <option value="0">澶辫触</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="璇疯緭鍏ヤ慨鏀规椂闂�"> + </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="updateBy" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none"> + <input id="updateBy$" name="updateBy$" 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="userQueryByupdateBy" onkeyup="autoLoad(this.getAttribute('data-key'))"> + <select class="cool-auto-complete-window-select" data-key="userQueryByupdateBySelect" 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="memo" 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> + -- Gitblit v1.9.1