From 43d1680b17baad487839ee6d025e969a5b760749 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 13 三月 2025 10:40:13 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/BasShuttleChargeMapper.xml | 17 +
/dev/null | 47 ---
src/main/java/com/zy/asrs/service/BasShuttleChargeService.java | 8
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 36 +
src/main/java/com/zy/asrs/mapper/BasShuttleChargeMapper.java | 12
src/main/java/com/zy/asrs/service/impl/BasShuttleChargeServiceImpl.java | 12
src/main/java/com/zy/asrs/controller/BasShuttleChargeController.java | 125 ++++++++
src/main/webapp/static/js/basShuttleCharge/basShuttleCharge.js | 261 +++++++++++++++++
src/main/webapp/views/admin/basShuttleCharge/basShuttleCharge_detail.html | 94 ++++++
src/main/java/com/zy/asrs/entity/BasShuttleCharge.java | 117 +++++++
src/main/java/com/zy/common/CodeBuilder.java | 2
src/main/webapp/views/admin/basShuttleCharge/basShuttleCharge.html | 114 +++++++
12 files changed, 783 insertions(+), 62 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasShuttleChargeController.java b/src/main/java/com/zy/asrs/controller/BasShuttleChargeController.java
new file mode 100644
index 0000000..9638420
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasShuttleChargeController.java
@@ -0,0 +1,125 @@
+package com.zy.asrs.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.DateUtils;
+import com.zy.asrs.entity.BasShuttleCharge;
+import com.zy.asrs.service.BasShuttleChargeService;
+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 BasShuttleChargeController extends BaseController {
+
+ @Autowired
+ private BasShuttleChargeService basShuttleChargeService;
+
+ @RequestMapping(value = "/basShuttleCharge/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(basShuttleChargeService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/basShuttleCharge/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<BasShuttleCharge> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(BasShuttleCharge.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(basShuttleChargeService.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 = "/basShuttleCharge/add/auth")
+ @ManagerAuth
+ public R add(BasShuttleCharge basShuttleCharge) {
+ basShuttleChargeService.insert(basShuttleCharge);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basShuttleCharge/update/auth")
+ @ManagerAuth
+ public R update(BasShuttleCharge basShuttleCharge){
+ if (Cools.isEmpty(basShuttleCharge) || null==basShuttleCharge.getId()){
+ return R.error();
+ }
+ basShuttleChargeService.updateById(basShuttleCharge);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basShuttleCharge/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ basShuttleChargeService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basShuttleCharge/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<BasShuttleCharge> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("basShuttleCharge"));
+ convert(map, wrapper);
+ List<BasShuttleCharge> list = basShuttleChargeService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/basShuttleChargeQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<BasShuttleCharge> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<BasShuttleCharge> page = basShuttleChargeService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (BasShuttleCharge basShuttleCharge : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", basShuttleCharge.getId());
+ map.put("value", basShuttleCharge.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/basShuttleCharge/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<BasShuttleCharge> wrapper = new EntityWrapper<BasShuttleCharge>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basShuttleChargeService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(BasShuttleCharge.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/BasShuttleCharge.java b/src/main/java/com/zy/asrs/entity/BasShuttleCharge.java
new file mode 100644
index 0000000..fed41da
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasShuttleCharge.java
@@ -0,0 +1,117 @@
+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 java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+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_shuttle_charge")
+public class BasShuttleCharge implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value= "")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 鍏呯數妗╃紪鍙�
+ */
+ @ApiModelProperty(value= "鍏呯數妗╃紪鍙�")
+ @TableField("charge_id")
+ private Integer chargeId;
+
+ /**
+ * 搴撲綅鍙�
+ */
+ @ApiModelProperty(value= "搴撲綅鍙�")
+ @TableField("loc_no")
+ private String locNo;
+
+ /**
+ * 寰呮満浣�
+ */
+ @ApiModelProperty(value= "寰呮満浣�")
+ @TableField("wait_loc_no")
+ private String waitLocNo;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @ApiModelProperty(value= "鍒涘缓鏃堕棿")
+ @TableField("create_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ @ApiModelProperty(value= "鏇存柊鏃堕棿")
+ @TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 鐘舵�� 0: 绂佺敤 1: 姝ｅ父
+ */
+ @ApiModelProperty(value= "鐘舵�� 0: 绂佺敤 1: 姝ｅ父 ")
+ private Integer status;
+
+ public BasShuttleCharge() {}
+
+ public BasShuttleCharge(Integer chargeId,String locNo,String waitLocNo,Date createTime,Date updateTime,Integer status) {
+ this.chargeId = chargeId;
+ this.locNo = locNo;
+ this.waitLocNo = waitLocNo;
+ this.createTime = createTime;
+ this.updateTime = updateTime;
+ this.status = status;
+ }
+
+// BasShuttleCharge basShuttleCharge = new BasShuttleCharge(
+// null, // 鍏呯數妗╃紪鍙�
+// null, // 搴撲綅鍙�
+// null, // 寰呮満浣�
+// null, // 鍒涘缓鏃堕棿
+// null, // 鏇存柊鏃堕棿
+// null // 鐘舵��
+// );
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 0:
+ return "绂佺敤";
+ case 1:
+ return "姝ｅ父";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/BasShuttleChargeMapper.java b/src/main/java/com/zy/asrs/mapper/BasShuttleChargeMapper.java
new file mode 100644
index 0000000..0836e3e
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasShuttleChargeMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.BasShuttleCharge;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasShuttleChargeMapper extends BaseMapper<BasShuttleCharge> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/BasShuttleChargeService.java b/src/main/java/com/zy/asrs/service/BasShuttleChargeService.java
new file mode 100644
index 0000000..dbe0eb9
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasShuttleChargeService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.BasShuttleCharge;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface BasShuttleChargeService extends IService<BasShuttleCharge> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasShuttleChargeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasShuttleChargeServiceImpl.java
new file mode 100644
index 0000000..f1c6cd7
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasShuttleChargeServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.BasShuttleChargeMapper;
+import com.zy.asrs.entity.BasShuttleCharge;
+import com.zy.asrs.service.BasShuttleChargeService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("basShuttleChargeService")
+public class BasShuttleChargeServiceImpl extends ServiceImpl<BasShuttleChargeMapper, BasShuttleCharge> implements BasShuttleChargeService {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 34a1ed2..bd953f2 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -74,6 +74,8 @@
private ForkLiftAction forkLiftAction;
@Autowired
private NotifyUtils notifyUtils;
+ @Autowired
+ private BasShuttleChargeService basShuttleChargeService;
/**
* 鍒濆鍖栧疄鏃跺湴鍥�
@@ -1082,6 +1084,12 @@
*/
public synchronized void loopShuttleCharge() {
try {
+
+ List<BasShuttleCharge> charges = basShuttleChargeService.selectList(new EntityWrapper<BasShuttleCharge>().orderBy("charge_id", true));
+ if (charges.isEmpty()) {
+ return;//鏃犲厖鐢垫々
+ }
+
for (ShuttleSlave shuttle : slaveProperties.getShuttle()) {
//鑾峰彇鍥涘悜绌挎杞︾嚎绋�
ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttle.getId());
@@ -1102,17 +1110,17 @@
//灏忚溅鎵�鍦ㄦゼ灞�
int lev = Utils.getLev(shuttleProtocol.getCurrentLocNo());
- ShuttleChargeType shuttleCharge = null;
+ BasShuttleCharge shuttleCharge = null;
//鎼滅储灏忚溅鎵�鍦ㄦゼ灞傛湁娌℃湁鍏呯數妗�
- for (ShuttleChargeType chargeType : ShuttleChargeType.values()) {
- if (lev != Utils.getLev(chargeType.locNo)) {
+ for (BasShuttleCharge charge : charges) {
+ if (lev != Utils.getLev(charge.getLocNo())) {
continue;//灏忚溅鍜屽厖鐢垫々涓嶅湪鍚屼竴灞�
}
//灏忚溅鍜屽厖鐢垫々鍦ㄥ悓涓�灞�
- if (wrkMastService.selectChargeWorkingByChargeSta(chargeType.id) == null) {
- shuttleCharge = chargeType;
+ if (wrkMastService.selectChargeWorkingByChargeSta(charge.getChargeId()) == null) {
+ shuttleCharge = charge;
break;
}
}
@@ -1120,17 +1128,17 @@
if (shuttleCharge == null) {
//鍚屾ゼ灞傛病鏈夋壘鍒板厖鐢垫々锛屾壘鍙敤鍏呯數妗�
//灏忚溅鍚屾ゼ灞傛病鏈夊厖鐢垫々锛屽彧瑕佸厖鐢垫々鍙敤灏辩敓鎴愬厖鐢典换鍔�
- for (ShuttleChargeType chargeType : ShuttleChargeType.values()) {
- if (wrkMastService.selectChargeWorkingByChargeSta(chargeType.id) == null) {
+ for (BasShuttleCharge charge : charges) {
+ if (wrkMastService.selectChargeWorkingByChargeSta(charge.getChargeId()) == null) {
//鍒ゆ柇褰撳墠鍏呯數妗╂ゼ灞傛槸鍚︽湁灏忚溅锛屽鏈夊皬杞︼紝涓嶅垎閰嶈鍏呯數妗�
- int chargeLev = Utils.getLev(chargeType.locNo);//鍏呯數妗╂ゼ灞�
+ int chargeLev = Utils.getLev(charge.getLocNo());//鍏呯數妗╂ゼ灞�
boolean checkLevHasShuttle = Utils.checkLevHasShuttle(chargeLev);//妫�娴嬫ゼ灞傛槸鍚︽湁绌挎杞�
if (checkLevHasShuttle) {
//褰撳墠鍏呯數妗╂ゼ灞傛湁绌挎杞︼紝涓嶅垎閰嶈鍏呯數妗�
continue;
}
- shuttleCharge = chargeType;
+ shuttleCharge = charge;
break;
}
}
@@ -1140,9 +1148,9 @@
continue;
}
- String chargeLocNo = shuttleCharge.locNo;
+ String chargeLocNo = shuttleCharge.getLocNo();
wrkMast = new WrkMast();
- wrkMast.setMk(String.valueOf(shuttleCharge.id));
+ wrkMast.setMk(String.valueOf(shuttleCharge.getChargeId()));
wrkMast.setWrkNo(commonService.getWorkNo(WrkIoType.SHUTTLE_CHARGE.id));
wrkMast.setWrkSts(WrkStsType.NEW_CHARGE.sts);
wrkMast.setIoType(WrkIoType.SHUTTLE_CHARGE.id);//300.鍏呯數
@@ -1357,13 +1365,13 @@
return false;
}
- ShuttleChargeType chargeType = ShuttleChargeType.get(Integer.parseInt(wrkMast.getMk()));
- if(chargeType == null) {
+ BasShuttleCharge basShuttleCharge = basShuttleChargeService.selectOne(new EntityWrapper<BasShuttleCharge>().eq("charge_id", wrkMast.getMk()));
+ if(basShuttleCharge == null) {
return false;
}
//璋冨害灏忚溅鍘诲緟鏈轰綅
- boolean dispatched = shuttleDispatchUtils.dispatchShuttle(wrkMast.getWrkNo(), chargeType.waitLocNo, wrkMast.getShuttleNo());
+ boolean dispatched = shuttleDispatchUtils.dispatchShuttle(wrkMast.getWrkNo(), basShuttleCharge.getWaitLocNo(), wrkMast.getShuttleNo());
if (!dispatched) {
return false;
}
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index 4a48676..d8243bc 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -15,7 +15,7 @@
generator.url="localhost:3306/shuttle_rcs";
generator.username="root";
generator.password="root";
- generator.table="asr_bas_map";
+ generator.table="asr_bas_shuttle_charge";
// sqlserver
// generator.sqlOsType = SqlOsType.SQL_SERVER;
// generator.url="127.0.0.1:1433;databasename=tzskasrs";
diff --git a/src/main/java/com/zy/core/enums/ShuttleChargeType.java b/src/main/java/com/zy/core/enums/ShuttleChargeType.java
deleted file mode 100644
index 7ed3039..0000000
--- a/src/main/java/com/zy/core/enums/ShuttleChargeType.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.zy.core.enums;
-
-import com.core.common.Cools;
-
-public enum ShuttleChargeType {
-
- CHARGE_1(1, "1000402", "0700402"),
- CHARGE_2(2, "1000403", "0700403"),
- ;
-
- ShuttleChargeType(int id, String locNo,String waitLocNo) {
- this.id = id;
- this.locNo = locNo;
- this.waitLocNo = waitLocNo;
- }
-
- public int id;
- public String locNo;
- public String waitLocNo;
-
- public static ShuttleChargeType get(String locNo) {
- if (Cools.isEmpty(locNo)) {
- return null;
- }
- ShuttleChargeType[] values = ShuttleChargeType.values();
- for (ShuttleChargeType value : values) {
- if (value.locNo.equals(locNo)) {
- return value;
- }
- }
- return null;
- }
-
- public static ShuttleChargeType get(int id) {
- if (Cools.isEmpty(id)) {
- return null;
- }
- ShuttleChargeType[] values = ShuttleChargeType.values();
- for (ShuttleChargeType value : values) {
- if (value.id == id) {
- return value;
- }
- }
- return null;
- }
-
-}
diff --git a/src/main/resources/mapper/BasShuttleChargeMapper.xml b/src/main/resources/mapper/BasShuttleChargeMapper.xml
new file mode 100644
index 0000000..813471f
--- /dev/null
+++ b/src/main/resources/mapper/BasShuttleChargeMapper.xml
@@ -0,0 +1,17 @@
+<?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.BasShuttleChargeMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasShuttleCharge">
+ <id column="id" property="id" />
+ <result column="charge_id" property="chargeId" />
+ <result column="loc_no" property="locNo" />
+ <result column="wait_loc_no" property="waitLocNo" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ <result column="status" property="status" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/basShuttleCharge/basShuttleCharge.js b/src/main/webapp/static/js/basShuttleCharge/basShuttleCharge.js
new file mode 100644
index 0000000..9dda313
--- /dev/null
+++ b/src/main/webapp/static/js/basShuttleCharge/basShuttleCharge.js
@@ -0,0 +1,261 @@
+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: '#basShuttleCharge',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/basShuttleCharge/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: '#'}
+ ,{field: 'chargeId', align: 'center',title: '鍏呯數妗╃紪鍙�'}
+ ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
+ ,{field: 'waitLocNo', align: 'center',title: '寰呮満浣�'}
+ // ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
+ // ,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿'}
+ ,{field: 'status$', 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(basShuttleCharge)', 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(basShuttleCharge)', 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 = {
+ 'basShuttleCharge': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/basShuttleCharge/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(basShuttleCharge)', 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+"/basShuttleCharge/"+(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+"/basShuttleCharge/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: '#createTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['createTime\\$']: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/admin/basShuttleCharge/basShuttleCharge.html b/src/main/webapp/views/admin/basShuttleCharge/basShuttleCharge.html
new file mode 100644
index 0000000..8ea564b
--- /dev/null
+++ b/src/main/webapp/views/admin/basShuttleCharge/basShuttleCharge.html
@@ -0,0 +1,114 @@
+<!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="basShuttleCharge" lay-filter="basShuttleCharge"></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/basShuttleCharge/basShuttleCharge.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="chargeId" placeholder="璇疯緭鍏ュ厖鐢垫々缂栧彿">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">搴撲綅鍙�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="locNo" placeholder="璇疯緭鍏ュ簱浣嶅彿">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">寰呮満浣�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="waitLocNo" placeholder="璇疯緭鍏ュ緟鏈轰綅">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐘舵��: </label>
+ <div class="layui-input-block">
+ <select name="status">
+ <option value="">璇烽�夋嫨鐘舵��</option>
+ <option value="0">绂佺敤</option>
+ <option value="1">姝ｅ父</option>
+ </select>
+ </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/admin/basShuttleCharge/basShuttleCharge_detail.html b/src/main/webapp/views/admin/basShuttleCharge/basShuttleCharge_detail.html
new file mode 100644
index 0000000..77153c2
--- /dev/null
+++ b/src/main/webapp/views/admin/basShuttleCharge/basShuttleCharge_detail.html
@@ -0,0 +1,94 @@
+<!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 id="data-detail" class="layer_self_wrap">
+ <form id="detail" class="layui-form">
+ <!--
+ <div class="layui-inline" style="display: none">
+ <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="id" class="layui-input" type="text" placeholder="缂栧彿">
+ </div>
+ </div>
+ -->
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label"><span class="not-null">*</span>锛�</label>
+ <div class="layui-input-inline">
+ <input id="id" class="layui-input" type="text" onkeyup="check(this.id, 'basShuttleCharge')" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鍏呯數妗╃紪鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="chargeId" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">搴� 浣� 鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="locNo" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">寰� 鏈� 浣嶏細</label>
+ <div class="layui-input-inline">
+ <input id="waitLocNo" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鍒涘缓鏃堕棿锛�</label>
+ <div class="layui-input-inline">
+ <input id="createTime$" class="layui-input" type="text" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鏇存柊鏃堕棿锛�</label>
+ <div class="layui-input-inline">
+ <input id="updateTime$" class="layui-input" type="text" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鐘躲��銆�鎬侊細</label>
+ <div class="layui-input-inline">
+ <select id="status">
+ <option value="" style="display: none"></option>
+ <option value="0">绂佺敤</option>
+ <option value="1">姝ｅ父</option>
+ </select>
+ </div>
+ </div>
+
+
+ <hr class="layui-bg-gray">
+
+ <div id="data-detail-btn" class="layui-btn-container layui-form-item">
+ <div id="data-detail-submit-save" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="save">淇濆瓨</div>
+ <div id="data-detail-submit-edit" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit">淇敼</div>
+ <div id="data-detail-close" type="button" class="layui-btn" lay-submit lay-filter="close">鍏抽棴</div>
+ </div>
+
+ <div id="prompt">
+ 娓╅Θ鎻愮ず锛氳浠旂粏濉啓鐩稿叧淇℃伅锛�<span class="extrude"><span class="not-null">*</span> 涓哄繀濉�夐」銆�</span>
+ </div>
+ </form>
+</div>
+</body>
+<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/basShuttleCharge/basShuttleCharge.js" charset="utf-8"></script>
+</html>
+
--
Gitblit v1.9.1