From dca272efbaf315859decfcd339b39f9f647fffad Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 27 三月 2023 10:17:21 +0800
Subject: [PATCH] #
---
src/main/webapp/views/basShuttle/basShuttle.html | 222 +++++++++
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 2
src/main/java/com/zy/asrs/mapper/BasShuttleMapper.java | 12
src/main/resources/mapper/LocDetlMapper.xml | 1
src/main/resources/mapper/LocMastMapper.xml | 39 +
src/main/resources/mapper/BasShuttleMapper.xml | 30 +
src/main/java/com/zy/asrs/service/BasShuttleService.java | 8
src/main/java/com/zy/asrs/utils/Utils.java | 42 +
src/main/java/com/zy/asrs/controller/BasShuttleController.java | 125 +++++
src/main/webapp/static/js/basShuttle/basShuttle.js | 274 +++++++++++
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 8
src/main/java/basShuttle.sql | 18
src/main/java/com/zy/asrs/service/impl/BasShuttleServiceImpl.java | 12
src/main/java/com/zy/common/service/CommonService.java | 196 ++-----
src/main/java/com/zy/asrs/entity/BasShuttle.java | 260 +++++++++++
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 40 +
src/main/java/com/zy/asrs/service/LocDetlService.java | 2
src/main/resources/mapper/WrkMastMapper.xml | 5
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 4
src/main/java/com/zy/common/CodeBuilder.java | 4
src/main/java/com/zy/asrs/service/WrkMastService.java | 2
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 5
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 2
src/main/java/com/zy/asrs/service/LocMastService.java | 6
src/main/resources/application.yml | 2
25 files changed, 1,174 insertions(+), 147 deletions(-)
diff --git a/src/main/java/basShuttle.sql b/src/main/java/basShuttle.sql
new file mode 100644
index 0000000..f881a43
--- /dev/null
+++ b/src/main/java/basShuttle.sql
@@ -0,0 +1,18 @@
+-- save basShuttle record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basShuttle/basShuttle.html', 'basShuttle绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basShuttle#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basShuttle#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basShuttle#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basShuttle#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basShuttle#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basShuttle/basShuttle.html', N'鍥涘悜杞︾鐞�', '40541', '2', '4', '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basShuttle#view', N'鏌ヨ', '60584', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basShuttle#btn-add', N'鏂板', '60584', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basShuttle#btn-edit', N'缂栬緫', '60584', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basShuttle#btn-delete', N'鍒犻櫎', '60584', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basShuttle#btn-export', N'瀵煎嚭', '60584', '3', '4', '1');
diff --git a/src/main/java/com/zy/asrs/controller/BasShuttleController.java b/src/main/java/com/zy/asrs/controller/BasShuttleController.java
new file mode 100644
index 0000000..5309bde
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasShuttleController.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.BasShuttle;
+import com.zy.asrs.service.BasShuttleService;
+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 BasShuttleController extends BaseController {
+
+ @Autowired
+ private BasShuttleService basShuttleService;
+
+ @RequestMapping(value = "/basShuttle/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(basShuttleService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/basShuttle/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<BasShuttle> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(BasShuttle.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(basShuttleService.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 = "/basShuttle/add/auth")
+ @ManagerAuth
+ public R add(BasShuttle basShuttle) {
+ basShuttleService.insert(basShuttle);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basShuttle/update/auth")
+ @ManagerAuth
+ public R update(BasShuttle basShuttle){
+ if (Cools.isEmpty(basShuttle) || null==basShuttle.getShuttleNo()){
+ return R.error();
+ }
+ basShuttleService.updateById(basShuttle);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basShuttle/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ basShuttleService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basShuttle/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<BasShuttle> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("basShuttle"));
+ convert(map, wrapper);
+ List<BasShuttle> list = basShuttleService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/basShuttleQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<BasShuttle> wrapper = new EntityWrapper<>();
+ wrapper.like("shuttle_no", condition);
+ Page<BasShuttle> page = basShuttleService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (BasShuttle basShuttle : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", basShuttle.getShuttleNo());
+ map.put("value", basShuttle.getShuttleNo());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/basShuttle/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<BasShuttle> wrapper = new EntityWrapper<BasShuttle>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basShuttleService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(BasShuttle.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/BasShuttle.java b/src/main/java/com/zy/asrs/entity/BasShuttle.java
new file mode 100644
index 0000000..28d8315
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasShuttle.java
@@ -0,0 +1,260 @@
+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.system.service.UserService;
+import com.zy.system.entity.User;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.core.common.SpringUtils;
+import com.zy.system.service.UserService;
+import com.zy.system.entity.User;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("asr_bas_shuttle")
+public class BasShuttle implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 鍥涘悜绌挎杞﹀彿
+ */
+ @ApiModelProperty(value= "鍥涘悜绌挎杞﹀彿")
+ @TableId(value = "shuttle_no", type = IdType.INPUT)
+ @TableField("shuttle_no")
+ private Integer shuttleNo;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ private Integer status;
+
+ /**
+ * 浣滀笟鎬�
+ */
+ @ApiModelProperty(value= "浣滀笟鎬�")
+ @TableField("shuttle_status")
+ private Integer shuttleStatus;
+
+ /**
+ * 浠诲姟鍙�
+ */
+ @ApiModelProperty(value= "浠诲姟鍙�")
+ @TableField("wrk_no")
+ private Integer wrkNo;
+
+ /**
+ * 鎺�
+ */
+ @ApiModelProperty(value= "鎺�")
+ private Integer row;
+
+ /**
+ * 鍒�
+ */
+ @ApiModelProperty(value= "鍒�")
+ private Integer bay;
+
+ /**
+ * 灞�
+ */
+ @ApiModelProperty(value= "灞�")
+ private Integer lev;
+
+ /**
+ * 鍘嗗彶鎺�
+ */
+ @ApiModelProperty(value= "鍘嗗彶鎺�")
+ @TableField("his_row")
+ private Integer hisRow;
+
+ /**
+ * 鍘嗗彶鍒�
+ */
+ @ApiModelProperty(value= "鍘嗗彶鍒�")
+ @TableField("his_bay")
+ private Integer hisBay;
+
+ /**
+ * 鍘嗗彶灞�
+ */
+ @ApiModelProperty(value= "鍘嗗彶灞�")
+ @TableField("his_lev")
+ private Integer hisLev;
+
+ /**
+ * 鏆傚瓨搴撲綅
+ */
+ @ApiModelProperty(value= "鏆傚瓨搴撲綅")
+ @TableField("idle_loc")
+ private String idleLoc;
+
+ /**
+ * 鑷姩鍏呯數
+ */
+ @ApiModelProperty(value= "鑷姩鍏呯數")
+ @TableField("auto_charge")
+ private Integer autoCharge;
+
+ /**
+ * 鐢甸噺绾�
+ */
+ @ApiModelProperty(value= "鐢甸噺绾�")
+ @TableField("charge_line")
+ private Integer chargeLine;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @TableField("create_by")
+ private Long createBy;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @TableField("create_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("update_by")
+ private Long updateBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ /**
+ * 鎻愬崌鏈哄彿
+ */
+ @ApiModelProperty(value= "鎻愬崌鏈哄彿")
+ @TableField("lift_no")
+ private Integer liftNo;
+
+ /**
+ * 鏍囪
+ */
+ @ApiModelProperty(value= "鏍囪")
+ @TableField("pak_mk")
+ private String pakMk;
+
+ public BasShuttle() {}
+
+ public BasShuttle(Integer shuttleNo,Integer status,Integer shuttleStatus,Integer wrkNo,Integer row,Integer bay,Integer lev,Integer hisRow,Integer hisBay,Integer hisLev,String idleLoc,Integer autoCharge,Integer chargeLine,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Integer liftNo,String pakMk) {
+ this.shuttleNo = shuttleNo;
+ this.status = status;
+ this.shuttleStatus = shuttleStatus;
+ this.wrkNo = wrkNo;
+ this.row = row;
+ this.bay = bay;
+ this.lev = lev;
+ this.hisRow = hisRow;
+ this.hisBay = hisBay;
+ this.hisLev = hisLev;
+ this.idleLoc = idleLoc;
+ this.autoCharge = autoCharge;
+ this.chargeLine = chargeLine;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ this.liftNo = liftNo;
+ this.pakMk = pakMk;
+ }
+
+// BasShuttle basShuttle = new BasShuttle(
+// null, // 鍥涘悜绌挎杞﹀彿[闈炵┖]
+// null, // 鐘舵��
+// null, // 浣滀笟鎬�
+// null, // 浠诲姟鍙�
+// null, // 鎺�
+// null, // 鍒�
+// null, // 灞�
+// null, // 鍘嗗彶鎺�
+// null, // 鍘嗗彶鍒�
+// null, // 鍘嗗彶灞�
+// null, // 鏆傚瓨搴撲綅
+// null, // 鑷姩鍏呯數
+// null, // 鐢甸噺绾�
+// null, // 娣诲姞浜哄憳
+// null, // 娣诲姞鏃堕棿
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 澶囨敞
+// null, // 鎻愬崌鏈哄彿
+// null // 鏍囪
+// );
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ 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;
+ }
+
+ 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/mapper/BasShuttleMapper.java b/src/main/java/com/zy/asrs/mapper/BasShuttleMapper.java
new file mode 100644
index 0000000..d85304a
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasShuttleMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.BasShuttle;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasShuttleMapper extends BaseMapper<BasShuttle> {
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index ce03a9e..87f43b5 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -30,7 +30,7 @@
@Update("update asr_loc_detl set loc_no = #{newLocNo}, modi_time=getDate() where loc_no = #{oldLocNo}")
int updateLocNo(String newLocNo, String oldLocNo);
- List<String> selectSameDetl(@Param("matnr") String matnr, @Param("start") Integer start, @Param("end") Integer end);
+ List<String> selectSameDetl(@Param("matnr") String matnr);
@Select("SELECT ld.loc_no FROM asr_loc_detl ld LEFT JOIN asr_loc_mast lm ON ld.loc_no = lm.loc_no WHERE (1 = 1 AND ld.matnr = #{matnr} AND (lm.row1 >= #{start} AND lm.row1 <= #{end}) AND lm.loc_sts = 'F' AND DateDiff(dd, lm.modi_time, getdate()) = 0) ORDER BY lm.modi_time ASC")
List<String> selectSameDetlToday(@Param("matnr") String matnr, @Param("start") Integer start, @Param("end") Integer end);
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index 5af99a4..8d52806 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -25,4 +25,12 @@
List<LocMast> queryFreeLocMast2(@Param("rows") List<Integer> rows, @Param("rowsLen") Integer rowsLen, @Param("locType1") Short locType1);
+ LocMast selectAvailableNearLocDesc(@Param("groupLoc") List<String> groupOuterLoc);
+
+ LocMast selectAvailableNearLocAsc(@Param("groupOuterLoc") List<String> groupOuterLoc);
+
+ List<LocMast> selectAllPeakLoc();
+
+ List<LocMast> selectAllLocNotEmpty(@Param("groupLoc") List<String> groupOuterLoc);
+
}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 5766e11..b175231 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -27,4 +27,6 @@
WrkMast selectOfPick(@Param("wrkNo") Integer wrkNo, @Param("ioType") Integer ioType);
+ List<WrkMast> selectSameMatnrs(@Param("matnr") String matnr);
+
}
diff --git a/src/main/java/com/zy/asrs/service/BasShuttleService.java b/src/main/java/com/zy/asrs/service/BasShuttleService.java
new file mode 100644
index 0000000..ed45783
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasShuttleService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.BasShuttle;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface BasShuttleService extends IService<BasShuttle> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 4acbc45..5526f91 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -26,7 +26,7 @@
* @param matnr 浜у搧鍙�
* @return locNo 搴撲綅鍙�
*/
- List<String> getSameDetl(String matnr, Integer start, Integer end);
+ List<String> getSameDetl(String matnr);
/**
* 鑾峰彇褰撳ぉ鐩稿悓瑙勬牸璐х墿鐨勬繁搴撲綅鍙�
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index 4d4fb60..0296383 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -54,4 +54,10 @@
// 鑾峰彇瀵瑰簲鍑哄簱鍫嗗灈鏈哄彿鐮�
Integer getOutCrnNo(LocMast locMast);
+ LocMast findNearloc(String locNo);
+
+ List<LocMast> selectAllPeakLoc();
+
+ Boolean checkAllLocEmpty(List<String> groupOuterLoc);
+
}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastService.java b/src/main/java/com/zy/asrs/service/WrkMastService.java
index de22e00..cfd3fed 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastService.java
@@ -27,4 +27,6 @@
Boolean setSteEmpty(Integer wrkNo);
WrkMast selectOfPick(Integer wrkNo, Integer ioType);
+
+ List<WrkMast> selectSameMatnrs(String s);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasShuttleServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasShuttleServiceImpl.java
new file mode 100644
index 0000000..7c3f623
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasShuttleServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.BasShuttleMapper;
+import com.zy.asrs.entity.BasShuttle;
+import com.zy.asrs.service.BasShuttleService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("basShuttleService")
+public class BasShuttleServiceImpl extends ServiceImpl<BasShuttleMapper, BasShuttle> implements BasShuttleService {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 688e2a5..6090731 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -38,8 +38,8 @@
}
@Override
- public List<String> getSameDetl(String matnr, Integer start, Integer end) {
- return this.baseMapper.selectSameDetl(matnr, start, end);
+ public List<String> getSameDetl(String matnr) {
+ return this.baseMapper.selectSameDetl(matnr);
}
@Override
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index 9a1ea8f..1dba6c3 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -136,4 +136,44 @@
return 1;
}
+ @Override
+ public LocMast findNearloc(String locNo) {
+ int row = getRow(locNo);
+ LocMast locMast = null;
+ if (row>19) {
+ List<String> groupOuterLoc = Utils.getGroupOuterLoc(locNo);
+ if (!Cools.isEmpty(groupOuterLoc)) {
+ locMast = this.baseMapper.selectAvailableNearLocDesc(groupOuterLoc);
+ }
+
+ }else {
+ List<String> groupOuterLoc = Utils.getGroupOuterLoc(locNo);
+ if (!Cools.isEmpty(groupOuterLoc)) {
+ locMast = this.baseMapper.selectAvailableNearLocAsc(groupOuterLoc);
+ }
+ }
+ return locMast;
+ }
+
+ /**
+ * 閫氳繃搴撲綅鍙疯幏鍙� 鎺�
+ */
+ public static int getRow(String locNo) {
+ if (!Cools.isEmpty(locNo)) {
+ return Integer.parseInt(locNo.substring(0, 2));
+ }
+ throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
+ }
+
+ @Override
+ public List<LocMast> selectAllPeakLoc() {
+ return this.baseMapper.selectAllPeakLoc();
+ }
+
+ @Override
+ public Boolean checkAllLocEmpty(List<String> groupOuterLoc) {
+ List<LocMast> result = this.baseMapper.selectAllLocNotEmpty(groupOuterLoc);
+ return result.size() <= 0;
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
index 9f7a679..2f977a0 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -115,4 +115,9 @@
return this.baseMapper.selectOfPick(wrkNo, ioType);
}
+ @Override
+ public List<WrkMast> selectSameMatnrs(String matnr) {
+ return this.baseMapper.selectSameMatnrs(matnr);
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 7a4e7a3..9fd11fb 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -234,15 +234,7 @@
public static List<String> getGroupOuterLoc(String locNo){
int row = getRow(locNo);
List<String> result = new ArrayList<>();
- if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
- for (Integer integer : CommonService.SECOND_GROUP_ROW_LIST) {
- if (integer < row) {
- result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
- } else {
- break;
- }
- }
- } else if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
+ if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
List<Integer> clone = Arrays.asList(new Integer[CommonService.FIRST_GROUP_ROW_LIST.size()]);
Collections.copy(clone, CommonService.FIRST_GROUP_ROW_LIST);
Collections.reverse(clone);
@@ -253,8 +245,36 @@
break;
}
}
- } else {
-// throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
+ } else if (CommonService.FIRST_GROUP_ROW_LIST_SHORT.contains(row)){
+ List<Integer> clone = Arrays.asList(new Integer[CommonService.FIRST_GROUP_ROW_LIST_SHORT.size()]);
+ Collections.copy(clone, CommonService.FIRST_GROUP_ROW_LIST_SHORT);
+ Collections.reverse(clone);
+ for (Integer integer : clone) {
+ if (integer > row) {
+ result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
+ } else {
+ break;
+ }
+ }
+ } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)){
+ List<Integer> clone = Arrays.asList(new Integer[CommonService.SECOND_GROUP_ROW_LIST.size()]);
+ Collections.copy(clone, CommonService.SECOND_GROUP_ROW_LIST);
+ Collections.reverse(clone);
+ for (Integer integer : clone) {
+ if (integer > row) {
+ result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
+ } else {
+ break;
+ }
+ }
+ } else if (CommonService.THIRD_GROUP_ROW_LIST.contains(row)){
+ for (Integer integer : CommonService.THIRD_GROUP_ROW_LIST) {
+ if (integer < row) {
+ result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
+ } else {
+ break;
+ }
+ }
}
return result;
}
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index cde6922..49344ba 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -17,10 +17,10 @@
// generator.table="sys_host";
// sqlserver
generator.sqlOsType = SqlOsType.SQL_SERVER;
- generator.url="10.10.10.100:1433;databasename=bfasrs";
+ generator.url="192.168.4.15:1433;databasename=xzjlasrs";
generator.username="sa";
generator.password="sa@123";
- generator.table="asr_bas_ste_err_log";
+ generator.table="asr_bas_shuttle";
generator.packagePath="com.zy.asrs";
generator.build();
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 11f1840..c0d057e 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -28,17 +28,18 @@
public class CommonService {
public static final List<Integer> FIRST_GROUP_ROW_LIST = new ArrayList<Integer>() {{
- add(1);add(2);add(3);add(4);
+ add(1);add(2);add(3);add(4);add(5);add(6);add(7);add(8);add(9);add(10);
+ }};
+ public static final List<Integer> FIRST_GROUP_ROW_LIST_SHORT = new ArrayList<Integer>() {{
+ add(8);add(9);add(10);
}};
public static final List<Integer> SECOND_GROUP_ROW_LIST = new ArrayList<Integer>() {{
- add(5);add(6);add(7);add(8);add(9);add(10);add(11);
+ add(12);add(13);add(14);add(15);add(16);add(17);add(18);
}};
- public static final List<Integer> FIRST_GROUP_ROW_LIST2 = new ArrayList<Integer>() {{
- add(2);add(3);add(4);
+ public static final List<Integer> THIRD_GROUP_ROW_LIST = new ArrayList<Integer>() {{
+ add(20);add(21);add(22);add(23);
}};
- public static final List<Integer> SECOND_GROUP_ROW_LIST10 = new ArrayList<Integer>() {{
- add(5);add(6);add(7);add(8);add(9);add(10);
- }};
+
@Autowired
private WrkMastService wrkMastService;
@@ -100,48 +101,45 @@
}
public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, int times) {
- LocTypeDto oldLocType = locTypeDto.clone();
- return getLocNo(whsType, staDescId, sourceStaNo, matNos, locTypeDto, oldLocType, times);
+ return getLocNo(staDescId, sourceStaNo, matNos, locTypeDto, times);
}
/**
* 妫�绱㈠簱浣嶅彿
- * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
* @param staDescId 璺緞ID
* @param sourceStaNo 婧愮珯
* @param matNos 鐗╂枡鍙烽泦鍚�
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
- public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, LocTypeDto oldLocType, int times) {
+ public StartupDto getLocNo(Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto,int times) {
+
StartupDto startupDto = new StartupDto();
- whsType = 1;
- // 鐢熸垚宸ヤ綔鍙�
- int workNo = getWorkNo(0);
- RowLastno rowLastno = rowLastnoService.selectById(whsType);
- if (Cools.isEmpty(rowLastno)) {
- throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
- }
- int curRow = rowLastno.getCurrentRow(); // 褰撳墠鍒�
- int sRow = rowLastno.getsRow(); // 璧峰鍒�
- int eRow = rowLastno.geteRow(); // 缁堟鍒�
- int crn_qty = rowLastno.getCrnQty(); // 鍫嗗灈鏈烘暟閲忥紙宸烽亾鏁伴噺锛�
- int rowCount = eRow - sRow + 1; // 搴撴帓鎬绘暟
- // 鐩爣鍫嗗灈鏈哄彿
- int crnNo = 0;
+
// 鐩爣搴撲綅
LocMast locMast = null;
- // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂�
- if (!Cools.isEmpty(matNos) && matNos.size() == 1) {
- List<String> locNos = locDetlService.getSameDetl(matNos.get(0), sRow, eRow);
- for (String locNo : locNos) {
- LocMast locMast0 = locMastService.findOutMost(locNo);
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 鐩稿悓璁㈠崟鍙�, 鍚屽ぉ鍚岃鏍肩墿鏂�
+ if (!Cools.isEmpty(matNos) && matNos.size() == 1 && staDescId == 1) {
+ //鍏堝垽鏂伐浣滄。锛屾煡鎵句富妗OType=1锛� wrkSts < 10鐨勫伐浣滄槑缁嗭紝鏂欏彿鐩稿悓鐨勬槑缁嗗簱浣�
+ List<WrkMast> wrkMasts = wrkMastService.selectSameMatnrs(matNos.get(0));
+ for (WrkMast wrkMast : wrkMasts) {
+ LocMast locMast0 = locMastService.findNearloc(wrkMast.getLocNo());
if (null != locMast0) {
// 娴呭簱浣嶇鍚堝昂瀵告娴�
if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
- // 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
- if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
- crnNo = locMast0.getCrnNo();
+ locMast = locMast0;
+ break;
+ }
+ }
+ }
+ if (Cools.isEmpty(locMast)) {
+ //鍐嶅垽鏂簱瀛樻槑缁嗘。锛屾枡鍙风浉鍚岀殑鏄庣粏搴撲綅
+ List<String> locNos = locDetlService.getSameDetl(matNos.get(0));
+ for (String locNo : locNos) {
+ LocMast locMast0 = locMastService.findNearloc(locNo);
+ if (null != locMast0) {
+ // 娴呭簱浣嶇鍚堝昂瀵告娴�
+ if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
locMast = locMast0;
break;
}
@@ -150,22 +148,20 @@
}
}
+
// 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
if (staDescId == 10) {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
+ .eq("loc_sts", "D"));
if (locMasts.size() > 0) {
for (LocMast loc : locMasts) {
- LocMast locMast0 = locMastService.findOutMost(loc.getLocNo());
+ LocMast locMast0 = locMastService.findNearloc(loc.getLocNo());
if (null != locMast0) {
// 娴呭簱浣嶇鍚堝昂瀵告娴�
if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
- // 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
- if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
- crnNo = locMast0.getCrnNo();
- locMast = locMast0;
- break;
- }
+ locMast = locMast0;
+ break;
+
}
}
}
@@ -173,126 +169,70 @@
}
// 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
- if (null == locMast) {
- if (curRow == 1) {
- curRow = 11;
- } else {
- curRow = 1;
- }
- if (basCrnpService.checkSiteError(1, true)) {
- crnNo = 1;
- }
- }
-
- if (crnNo == 0) {
- throw new CoolException("娌℃湁鍙敤鐨勫爢鍨涙満");
- }
-
// 鑾峰彇鐩爣绔�
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", staDescId)
- .eq("stn_no", sourceStaNo)
- .eq("crn_no", crnNo);
+ .eq("stn_no", sourceStaNo);
StaDesc staDesc = staDescService.selectOne(wrapper);
if (Cools.isEmpty(staDesc)) {
- log.error("鍏ュ簱璺緞涓嶅瓨鍦�, staDescId={}, sourceStaNo={}, crnNo={}", staDescId, sourceStaNo, crnNo);
+ log.error("鍏ュ簱璺緞涓嶅瓨鍦�, staDescId={}, sourceStaNo={}", staDescId, sourceStaNo);
throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
}
// 妫�娴嬬洰鏍囩珯
BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
if (!staNo.getAutoing().equals("Y")) {
- throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+ throw new CoolException("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
}
-
- // 鏇存柊搴撲綅鎺掑彿
- rowLastno.setCurrentRow(curRow);
- rowLastnoService.updateById(rowLastno);
// 寮�濮嬫煡鎵惧簱浣� ==============================>>
// 1.褰撴绱㈠簱鎺掍负娴呭簱浣嶆帓鏃讹紝浼樺厛瀵绘壘褰撳墠搴撴帓鐨勬繁搴撲綅鎺�
if (locMast == null) {
- List<Integer> rows = Utils.getGroupLoc(curRow);
-
- List<LocMast> locMasts = locMastService.queryFreeLocMast(rows, rows.size(), locTypeDto.getLocType1());
- if (!Cools.isEmpty(locMasts)) {
- Integer innermostRow = Utils.getInnermostRow(locMasts.get(0).getLocNo());
- for (LocMast one : locMasts) {
- if (one.getRow1().equals(innermostRow)) {
- locMast = one;
- break;
- }
+ List<LocMast> peakLocs = locMastService.selectAllPeakLoc();
+ for (LocMast peakLoc : peakLocs) {
+ List<String> groupInsideLoc = Utils.getGroupInsideLoc(peakLoc.getLocNo());
+ if (!Cools.isEmpty(groupInsideLoc)){
+ if (!locMastService.checkAllLocEmpty(groupInsideLoc)) continue;
+ locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no", groupInsideLoc.get(0)));
+ break;
+ }else {
+ locMast=peakLoc;
+ break;
}
- }
- if (Cools.isEmpty(locMast)){
- if (rows.equals(FIRST_GROUP_ROW_LIST)){
- rows=FIRST_GROUP_ROW_LIST2;
- }else if (rows.equals(SECOND_GROUP_ROW_LIST)){
- rows=SECOND_GROUP_ROW_LIST10;
- }
- List<LocMast> locMasts1 = locMastService.queryFreeLocMast2(rows, rows.size(), locTypeDto.getLocType1());
- if (!Cools.isEmpty(locMasts1)) {
- Integer innermostRow = Utils.getInnermostRow(locMasts1.get(0).getLocNo());
- if (rows.equals(FIRST_GROUP_ROW_LIST2)){
- innermostRow=innermostRow+1;
- }else if (rows.equals(SECOND_GROUP_ROW_LIST10)){
- innermostRow=innermostRow-1;
- }
- for (LocMast one : locMasts1) {
- if (one.getRow1().equals(innermostRow)) {
- locMast = one;
- break;
- }
- }
- }
- }
- // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (!locMastService.checkEmptyCount(locMast, 10)) {
- locMast = null;
}
}
// 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
if (Cools.isEmpty(locMast)) {
- // 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
- if (times < rowCount) {
- times = times + 1;
- return getLocNo(whsType, staDescId, sourceStaNo, matNos, locTypeDto, oldLocType, times);
- } else {
- times = 0;
+ List<LocMast> peakLocs = locMastService.selectAllPeakLoc();
+ for (LocMast peakLoc : peakLocs) {
+ List<String> groupOuterLoc = Utils.getGroupInsideLoc(peakLoc.getLocNo());
+ if (!Cools.isEmpty(groupOuterLoc)){
+ if (!locMastService.checkAllLocEmpty(groupOuterLoc)) continue;
+ locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no", groupOuterLoc.get(0)));
+ }else {
+ locMast = peakLoc;
+ }
+
}
- // 璐х墿妫�绱綆搴撲綅浠撳け璐ワ紝鍏煎楂樺簱浣嶄粨鍚庣户缁墽琛�
-// if (locTypeDto.getLocType1() == 1) {
-// locTypeDto.setLocType1((short) 2);
-// return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, oldLocType, times);
-// }
- log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
- throw new CoolException("娌℃湁绌哄簱浣�");
+ if (Cools.isEmpty(locMast)) {
+ log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
+ throw new CoolException("娌℃湁绌哄簱浣�");
+ }
}
String locNo = locMast.getLocNo();
+ // 鐢熸垚宸ヤ綔鍙�
+ int workNo = getWorkNo(0);
// 杩斿洖dto
startupDto.setWorkNo(workNo);
- startupDto.setCrnNo(crnNo);
startupDto.setSourceStaNo(sourceStaNo);
startupDto.setStaNo(staNo.getDevNo());
startupDto.setLocNo(locNo);
return startupDto;
- }
-
- public static String zerofill(String msg, Integer count) {
- if (msg.length() == count) {
- return msg;
- } else if (msg.length() > count) {
- return msg.substring(0, 16);
- } else {
- StringBuilder msgBuilder = new StringBuilder(msg);
- for(int i = 0; i < count - msg.length(); ++i) {
- msgBuilder.insert(0, "0");
- }
- return msgBuilder.toString();
- }
}
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 537c45c..8face35 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,7 +10,7 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=szfzasrs
+ url: jdbc:sqlserver://192.168.4.15:1433;databasename=xzjlasrs
username: sa
password: sa@123
mvc:
diff --git a/src/main/resources/mapper/BasShuttleMapper.xml b/src/main/resources/mapper/BasShuttleMapper.xml
new file mode 100644
index 0000000..354bd82
--- /dev/null
+++ b/src/main/resources/mapper/BasShuttleMapper.xml
@@ -0,0 +1,30 @@
+<?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.BasShuttleMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasShuttle">
+ <result column="shuttle_no" property="shuttleNo" />
+ <result column="status" property="status" />
+ <result column="shuttle_status" property="shuttleStatus" />
+ <result column="wrk_no" property="wrkNo" />
+ <result column="row" property="row" />
+ <result column="bay" property="bay" />
+ <result column="lev" property="lev" />
+ <result column="his_row" property="hisRow" />
+ <result column="his_bay" property="hisBay" />
+ <result column="his_lev" property="hisLev" />
+ <result column="idle_loc" property="idleLoc" />
+ <result column="auto_charge" property="autoCharge" />
+ <result column="charge_line" property="chargeLine" />
+ <result column="create_by" property="createBy" />
+ <result column="create_time" property="createTime" />
+ <result column="update_by" property="updateBy" />
+ <result column="update_time" property="updateTime" />
+ <result column="memo" property="memo" />
+ <result column="lift_no" property="liftNo" />
+ <result column="pak_mk" property="pakMk" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index aa3488a..18c0803 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -315,7 +315,6 @@
) dual on dual.loc_no = lm.loc_no
WHERE 1 = 1
AND ld.matnr = #{matnr}
- AND (lm.row1 >= #{start} AND lm.row1 <= #{end})
AND (lm.loc_sts = 'F')
AND dual.count = 1
ORDER BY lm.modi_time ASC
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 3ed94b1..6e94452 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -112,4 +112,43 @@
order by loc_sts desc ,lev1 asc,bay1 asc
</select>
+ <select id="selectAvailableNearLocDesc" resultMap="BaseResultMap">
+ SELECT TOP 1 * FROM asr_loc_mast WHERE loc_sts IN ('O')
+ <foreach collection="groupLoc" item="loc" index="index" open="AND loc_no IN (" close=")" separator=",">
+ #{loc}
+ </foreach>
+ ORDER BY
+ row1 DESC
+ </select>
+ <select id="selectAvailableNearLocAsc" resultMap="BaseResultMap">
+ SELECT TOP 1 * FROM asr_loc_mast WHERE loc_sts IN ('O') AND loc_no IN
+ <foreach collection="groupOuterLoc" item="loc" index="index" open="(" close=")" separator=",">
+ #{loc}
+ </foreach>
+ ORDER BY
+ row1 ASC
+ </select>
+
+ <select id="selectAllPeakLoc" resultMap="BaseResultMap">
+ SELECT a.*
+ from(
+ SELECT * FROM asr_loc_mast WHERE loc_sts = 'O' AND row1 = 1
+ UNION ALL
+ SELECT * FROM asr_loc_mast WHERE loc_sts = 'O' AND row1 = 8 and bay1 > 7
+ UNION ALL
+ SELECT * FROM asr_loc_mast WHERE loc_sts = 'O' AND row1 = 12
+ UNION ALL
+ SELECT * FROM asr_loc_mast WHERE loc_sts = 'O' AND row1 = 23
+ UNION ALL
+ SELECT * FROM asr_loc_mast WHERE loc_sts = 'O' AND row1 = 18 AND (bay1 = 1 or bay1 = 3 )
+ ) a ORDER BY a.lev1,a.bay1 ASC
+ </select>
+
+ <select id="selectAllLocNotEmpty" resultMap="BaseResultMap">
+ SELECT * FROM asr_loc_mast WHERE loc_sts != 'O' AND loc_no in
+ <foreach collection="groupLoc" item="loc" index="index" open="(" close=")" separator=",">
+ #{loc}
+ </foreach>
+ </select>
+
</mapper>
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 70dd04c..ad96104 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -100,4 +100,9 @@
select top 1 * from asr_wrk_mast where wrk_no=#{wrkNo} and wrk_sts=17 and io_type = #{ioType}
</select>
+ <select id="selectSameMatnrs" resultMap="BaseResultMap">
+ select loc_no from asr_wrk_mast m,asr_wrk_detl d
+ where m.wrk_no=d.wrk_no and io_type=1 and wrk_sts < 11 and d.matnr = #{matnr} ORDER BY m.wrk_no desc
+ </select>
+
</mapper>
diff --git a/src/main/webapp/static/js/basShuttle/basShuttle.js b/src/main/webapp/static/js/basShuttle/basShuttle.js
new file mode 100644
index 0000000..cc4958b
--- /dev/null
+++ b/src/main/webapp/static/js/basShuttle/basShuttle.js
@@ -0,0 +1,274 @@
+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: '#basShuttle',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/basShuttle/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'shuttleNo', align: 'center',title: '鍥涘悜绌挎杞﹀彿'}
+ ,{field: 'status$', align: 'center',title: '鐘舵��'}
+ ,{field: 'shuttleStatus', align: 'center',title: '浣滀笟鎬�'}
+ ,{field: 'wrkNo', align: 'center',title: '浠诲姟鍙�'}
+ ,{field: 'row', align: 'center',title: '鎺�'}
+ ,{field: 'bay', align: 'center',title: '鍒�'}
+ ,{field: 'lev', align: 'center',title: '灞�'}
+ ,{field: 'hisRow', align: 'center',title: '鍘嗗彶鎺�'}
+ ,{field: 'hisBay', align: 'center',title: '鍘嗗彶鍒�'}
+ ,{field: 'hisLev', align: 'center',title: '鍘嗗彶灞�'}
+ ,{field: 'idleLoc', align: 'center',title: '鏆傚瓨搴撲綅'}
+ ,{field: 'autoCharge', align: 'center',title: '鑷姩鍏呯數'}
+ ,{field: 'chargeLine', align: 'center',title: '鐢甸噺绾�'}
+ ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
+ ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
+ ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'memo', align: 'center',title: '澶囨敞'}
+ ,{field: 'liftNo', align: 'center',title: '鎻愬崌鏈哄彿'}
+ ,{field: 'pakMk', 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(basShuttle)', 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(basShuttle)', 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.shuttleNo;
+ }));
+ 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 = {
+ 'basShuttle': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/basShuttle/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(basShuttle)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ del([data.shuttleNo]);
+ 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+"/basShuttle/"+(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+"/basShuttle/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/basShuttle/basShuttle.html b/src/main/webapp/views/basShuttle/basShuttle.html
new file mode 100644
index 0000000..df578b7
--- /dev/null
+++ b/src/main/webapp/views/basShuttle/basShuttle.html
@@ -0,0 +1,222 @@
+<!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="basShuttle" lay-filter="basShuttle"></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/basShuttle/basShuttle.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="shuttleNo" placeholder="璇疯緭鍏ュ洓鍚戠┛姊溅鍙�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐘舵��: </label>
+ <div class="layui-input-block">
+ <select name="status">
+ <option value="">璇烽�夋嫨鐘舵��</option>
+ <option value="1">姝ｅ父</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="shuttleStatus" placeholder="璇疯緭鍏ヤ綔涓氭��">
+ </div>
+ </div>
+ <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="row" placeholder="璇疯緭鍏ユ帓">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍒�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="bay" placeholder="璇疯緭鍏ュ垪">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">灞�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="lev" placeholder="璇疯緭鍏ュ眰">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍘嗗彶鎺�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="hisRow" placeholder="璇疯緭鍏ュ巻鍙叉帓">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍘嗗彶鍒�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="hisBay" placeholder="璇疯緭鍏ュ巻鍙插垪">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍘嗗彶灞�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="hisLev" placeholder="璇疯緭鍏ュ巻鍙插眰">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏆傚瓨搴撲綅: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="idleLoc" placeholder="璇疯緭鍏ユ殏瀛樺簱浣�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鑷姩鍏呯數: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="autoCharge" placeholder="璇疯緭鍏ヨ嚜鍔ㄥ厖鐢�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐢甸噺绾�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="chargeLine" 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="createBy" placeholder="璇疯緭鍏ユ坊鍔犱汉鍛�" style="display: none">
+ <input id="createBy$" name="createBy$" 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="userQueryBycreateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryBycreateBySelect" 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="createTime" id="createTime$" 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="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="memo" placeholder="璇疯緭鍏ュ娉�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鎻愬崌鏈哄彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="liftNo" placeholder="璇疯緭鍏ユ彁鍗囨満鍙�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏍囪: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="pakMk" 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