From 6eecac9d82c970acf021669e3bb4cd782f36bbfe Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 24 一月 2024 11:34:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/BasBoxTypeServiceImpl.java | 12
src/main/java/com/zy/asrs/service/impl/RgvOneSignServiceImpl.java | 12
src/main/webapp/static/js/basBoxType/basBoxType.js | 247 +++++++++++
src/main/webapp/views/basBoxType/basBoxType.html | 98 ++++
src/main/webapp/views/order/order.html | 5
src/main/java/com/zy/asrs/mapper/BasBoxTypeMapper.java | 12
src/main/resources/mapper/BasBoxTypeMapper.xml | 13
src/main/java/com/zy/asrs/entity/BasBoxType.java | 52 ++
src/main/java/com/zy/asrs/entity/RgvOneSign.java | 55 ++
src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | 4
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 4
src/main/webapp/views/index.html | 2
src/main/java/basBoxType.sql | 18
src/main/java/com/zy/asrs/controller/BasBoxTypeController.java | 126 +++++
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 41 +
src/main/java/com/zy/asrs/service/MobileService.java | 3
src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java | 16
src/main/resources/mapper/RgvOneSignMapper.xml | 13
src/main/webapp/views/rgvOneSign/rgvOneSign.html | 92 ++++
src/main/java/com/zy/asrs/controller/MobileController.java | 22
src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java | 12
src/main/java/com/zy/asrs/entity/param/PalletizingCompleteTwoFloorParam.java | 1
src/main/java/com/zy/common/CodeBuilder.java | 2
src/main/java/rgvOneSign.sql | 18
src/main/java/com/zy/asrs/service/BasBoxTypeService.java | 8
src/main/java/com/zy/asrs/entity/LocDetl.java | 2
src/main/java/com/zy/asrs/mapper/RgvOneSignMapper.java | 12
src/main/java/com/zy/asrs/service/RgvOneSignService.java | 8
src/main/webapp/static/js/rgvOneSign/rgvOneSign.js | 246 +++++++++++
src/main/java/com/zy/asrs/controller/RgvOneSignController.java | 125 +++++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 2
src/main/webapp/views/login.html | 2
32 files changed, 1,259 insertions(+), 26 deletions(-)
diff --git a/src/main/java/basBoxType.sql b/src/main/java/basBoxType.sql
new file mode 100644
index 0000000..7b64b47
--- /dev/null
+++ b/src/main/java/basBoxType.sql
@@ -0,0 +1,18 @@
+-- save basBoxType record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basBoxType/basBoxType.html', 'basBoxType绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basBoxType#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basBoxType#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basBoxType#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basBoxType#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basBoxType#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basBoxType/basBoxType.html', N'basBoxType绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basBoxType#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basBoxType#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basBoxType#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basBoxType#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basBoxType#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/java/com/zy/asrs/controller/BasBoxTypeController.java b/src/main/java/com/zy/asrs/controller/BasBoxTypeController.java
new file mode 100644
index 0000000..e480a83
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasBoxTypeController.java
@@ -0,0 +1,126 @@
+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.BasBoxType;
+import com.zy.asrs.service.BasBoxTypeService;
+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 BasBoxTypeController extends BaseController {
+
+ @Autowired
+ private BasBoxTypeService basBoxTypeService;
+
+ @RequestMapping(value = "/basBoxType/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(basBoxTypeService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/basBoxType/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<BasBoxType> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(BasBoxType.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ wrapper.orderBy("id",true);
+ return R.ok(basBoxTypeService.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 = "/basBoxType/add/auth")
+ @ManagerAuth
+ public R add(BasBoxType basBoxType) {
+ basBoxTypeService.insert(basBoxType);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basBoxType/update/auth")
+ @ManagerAuth
+ public R update(BasBoxType basBoxType){
+ if (Cools.isEmpty(basBoxType) || null==basBoxType.getId()){
+ return R.error();
+ }
+ basBoxTypeService.updateById(basBoxType);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basBoxType/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ basBoxTypeService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basBoxType/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<BasBoxType> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("basBoxType"));
+ convert(map, wrapper);
+ List<BasBoxType> list = basBoxTypeService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/basBoxTypeQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<BasBoxType> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<BasBoxType> page = basBoxTypeService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (BasBoxType basBoxType : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", basBoxType.getId());
+ map.put("value", basBoxType.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/basBoxType/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<BasBoxType> wrapper = new EntityWrapper<BasBoxType>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basBoxTypeService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(BasBoxType.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 86195a4..9402307 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -56,6 +56,8 @@
private ManLocDetlMapper manLocDetlMapper;
@Autowired
private WrkDetlLogService wrkDetlLogService;
+ @Autowired
+ private RgvOneSignService rgvOneSignService;
// 鍟嗗搧涓婃灦
@@ -76,8 +78,12 @@
@RequestMapping("/search/sign/auth/v2")
// @ManagerAuth(memo = "鎷嗗彔鐩樻ā寮忓垏鎹�")
public R orderSearchByBarcodeV2(@RequestParam boolean sign){
- Integer signRu = 1;
- return R.ok(signRu);
+ RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
+ if (sign){
+ rgvOneSign.setRgvOneSign(1-rgvOneSign.getRgvOneSign());
+ rgvOneSignService.updateById(rgvOneSign);
+ }
+ return R.ok(rgvOneSign.getRgvOneSign());
}
@@ -285,12 +291,22 @@
* 涓帶锛�2妤�212鍙墭鐩�
*/
@PostMapping("/balcony/complete/car/auth/v1")
- @AppAuth(memo = "涓帶锛�2妤�212鍙墭鐩�")
+// @AppAuth(memo = "涓帶锛�2妤�212鍙墭鐩�")
public synchronized R balconyCompleteCar() {
mobileService.trussComb2Car(212);
return R.ok();
}
+ /**
+ * 涓帶锛氳幏鍙栫鍨嬬紪鍙�
+ */
+ @PostMapping("/box/type/complete/auth/v1")
+// @AppAuth(memo = "涓帶锛氳幏鍙栫鍨嬬紪鍙�")
+ public synchronized R boxTypeCompleteCar() {
+ List<Map<String, Object>> maps = mobileService.boxTypeComb();
+ return R.ok().add(maps);
+ }
+
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
diff --git a/src/main/java/com/zy/asrs/controller/RgvOneSignController.java b/src/main/java/com/zy/asrs/controller/RgvOneSignController.java
new file mode 100644
index 0000000..34986f4
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/RgvOneSignController.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.RgvOneSign;
+import com.zy.asrs.service.RgvOneSignService;
+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 RgvOneSignController extends BaseController {
+
+ @Autowired
+ private RgvOneSignService rgvOneSignService;
+
+ @RequestMapping(value = "/rgvOneSign/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(rgvOneSignService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/rgvOneSign/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<RgvOneSign> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(RgvOneSign.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(rgvOneSignService.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 = "/rgvOneSign/add/auth")
+ @ManagerAuth
+ public R add(RgvOneSign rgvOneSign) {
+ rgvOneSignService.insert(rgvOneSign);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/rgvOneSign/update/auth")
+ @ManagerAuth
+ public R update(RgvOneSign rgvOneSign){
+ if (Cools.isEmpty(rgvOneSign) || null==rgvOneSign.getId()){
+ return R.error();
+ }
+ rgvOneSignService.updateById(rgvOneSign);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/rgvOneSign/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ rgvOneSignService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/rgvOneSign/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<RgvOneSign> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("rgvOneSign"));
+ convert(map, wrapper);
+ List<RgvOneSign> list = rgvOneSignService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/rgvOneSignQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<RgvOneSign> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<RgvOneSign> page = rgvOneSignService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (RgvOneSign rgvOneSign : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", rgvOneSign.getId());
+ map.put("value", rgvOneSign.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/rgvOneSign/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<RgvOneSign> wrapper = new EntityWrapper<RgvOneSign>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != rgvOneSignService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(RgvOneSign.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/BasBoxType.java b/src/main/java/com/zy/asrs/entity/BasBoxType.java
new file mode 100644
index 0000000..68f9945
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasBoxType.java
@@ -0,0 +1,52 @@
+package com.zy.asrs.entity;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("asr_bas_box_type")
+public class BasBoxType implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 浠诲姟鍙�
+ */
+ @ApiModelProperty(value= "绠卞瀷")
+ @TableField("box_specs")
+ private String boxSpecs;
+
+ /**
+ * 鍫嗗灈鏈�
+ */
+ @ApiModelProperty(value= "绠卞瀷缂栧彿")
+ @TableField("box_type")
+ private String boxType;
+
+ public BasBoxType() {}
+
+ public BasBoxType(String boxSpecs,String boxType) {
+ this.boxSpecs = boxSpecs;
+ this.boxType = boxType;
+ }
+
+// BasBoxType basBoxType = new BasBoxType(
+// null, // 浠诲姟鍙穂闈炵┖]
+// null // 鍫嗗灈鏈�
+// );
+
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 6242fc7..263283d 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -80,7 +80,7 @@
@ApiModelProperty(value= "鏉＄爜")
private String barcode;
- @ApiModelProperty(value= "浜у湴")
+ @ApiModelProperty(value= "浜у湴 浣嶇疆")
private String origin;
@ApiModelProperty(value= "鍘傚")
diff --git a/src/main/java/com/zy/asrs/entity/RgvOneSign.java b/src/main/java/com/zy/asrs/entity/RgvOneSign.java
new file mode 100644
index 0000000..9e3fe2e
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/RgvOneSign.java
@@ -0,0 +1,55 @@
+package com.zy.asrs.entity;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("bas_rgv_one_sign")
+public class RgvOneSign implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 缂栧彿
+ */
+ @ApiModelProperty(value= "缂栧彿")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 鍐呭
+ */
+ @ApiModelProperty(value= "1妤兼爣璁�")
+ @TableField("rgv_one_sign")
+ private Integer rgvOneSign;
+
+ /**
+ * 鍐呭
+ */
+ @ApiModelProperty(value= "oneSign")
+ @TableField("rgv_one_type")
+ private String rgvOneType;
+
+ public RgvOneSign() {}
+
+ public RgvOneSign(Integer rgvOneSign) {
+ this.rgvOneSign = rgvOneSign;
+ }
+
+ public RgvOneSign(Integer rgvOneSign,String rgvOneType) {
+ this.rgvOneSign = rgvOneSign;
+ this.rgvOneType = rgvOneType;
+ }
+
+// RgvOneSign rgvOneSign = new RgvOneSign(
+// null // 鍐呭[闈炵┖]
+// );
+
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteTwoFloorParam.java b/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteTwoFloorParam.java
index 96c6676..9ecfaf4 100644
--- a/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteTwoFloorParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteTwoFloorParam.java
@@ -27,6 +27,7 @@
private Double roughWeight;// 鏄� 灏忔暟鍨� 閲嶉噺 姣涢噸
private Double anfme=1.0;// 鏄� 灏忔暟鍨� //榛樿
private Double rollExtent;// 鏄� 灏忔暟鍨� 鍗烽暱搴�
+ private int joint;// 鏄� 鏁村瀷 鎺ュご
}
diff --git a/src/main/java/com/zy/asrs/mapper/BasBoxTypeMapper.java b/src/main/java/com/zy/asrs/mapper/BasBoxTypeMapper.java
new file mode 100644
index 0000000..1455d68
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasBoxTypeMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.BasBoxType;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasBoxTypeMapper extends BaseMapper<BasBoxType> {
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/RgvOneSignMapper.java b/src/main/java/com/zy/asrs/mapper/RgvOneSignMapper.java
new file mode 100644
index 0000000..017948e
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/RgvOneSignMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.RgvOneSign;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface RgvOneSignMapper extends BaseMapper<RgvOneSign> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/BasBoxTypeService.java b/src/main/java/com/zy/asrs/service/BasBoxTypeService.java
new file mode 100644
index 0000000..4d4364c
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasBoxTypeService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.BasBoxType;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface BasBoxTypeService extends IService<BasBoxType> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index 7e6b8b2..7621855 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -7,6 +7,8 @@
import com.zy.asrs.entity.param.*;
import java.util.Date;
+import java.util.List;
+import java.util.Map;
public interface MobileService {
@@ -37,6 +39,7 @@
void packComb(CombParam param, Long userId);
void pakoutByOrder(JSONObject param, Long userId);
+ List<Map<String, Object>> boxTypeComb();
void stockOut(OrderDetl orderDetl, BasDevp staNo, LocDetl locDetl,
Double curOutQty, Integer ioType, Long userId, Date now);
diff --git a/src/main/java/com/zy/asrs/service/RgvOneSignService.java b/src/main/java/com/zy/asrs/service/RgvOneSignService.java
new file mode 100644
index 0000000..556c635
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/RgvOneSignService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.RgvOneSign;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface RgvOneSignService extends IService<RgvOneSign> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasBoxTypeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasBoxTypeServiceImpl.java
new file mode 100644
index 0000000..d6db0e1
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasBoxTypeServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.BasBoxTypeMapper;
+import com.zy.asrs.entity.BasBoxType;
+import com.zy.asrs.service.BasBoxTypeService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("basBoxTypeService")
+public class BasBoxTypeServiceImpl extends ServiceImpl<BasBoxTypeMapper, BasBoxType> implements BasBoxTypeService {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index c0d6320..c0c1421 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -4,6 +4,7 @@
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.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
@@ -29,10 +30,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
/**
* 绉诲姩绔湇鍔℃牳蹇冪被
@@ -88,6 +86,8 @@
private LocDetlRullUpDetailService locDetlRullUpDetailService;
@Autowired
private TagService tagService;
+ @Autowired
+ private BasBoxTypeService basBoxTypeService;
@Override
@@ -391,11 +391,11 @@
} else if (basDevp.getWrkNo()!=0){
throw new CoolException("212绔欑偣鏈夊伐浣滃彿");
}
- int workNo = 20211;
- WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", 20211));
+ WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 212));
if (!Cools.isEmpty(wrkMast1)){
throw new CoolException("浠诲姟妗ｆ宸插瓨鍦紒璇风瓑寰�...");
}
+ int workNo = commonService.getWorkNo(6);
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -424,6 +424,13 @@
public void PalletizingCompleteTwoFloorParam(PalletizingCompleteTwoFloorParam param) {
Long userId = 7777L;//涓帶
param.setPalletizingNo(212);
+
+ WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+ .eq("io_type", 1).eq("wrk_sts", 1).eq("source_sta_no",212));
+ if (!Cools.isEmpty(wrkMast1)){
+ throw new CoolException("瀛樺湪涓�绗斿伐浣滄。妗堬紝璇峰厛鍏ュ簱锛�");
+ }
+
//鍒ゆ柇param鍙傛暟
if (Cools.isEmpty(param.getBarcode())){
throw new CoolException("鍙傛暟锛氭墭鐩樼爜 barcode涓虹┖");
@@ -483,8 +490,13 @@
}else {
throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo:"+matList.getBatch()+",鏈ㄧ缂栫爜瀛樺湪閲嶅");
}
- }
+ if (locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("batch", matList.getBatch()))!=0
+ || wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("batch", matList.getBatch()))!=0
+ || waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("batch", matList.getBatch()))!=0){
+ throw new CoolException("鏈ㄧ缂栧彿锛�"+matList.getBatch()+"宸插瓨鍦紝璇峰嬁閲嶅鍏ュ簱");
+ }
+ }
if (locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()))!=0
|| wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()))!=0
@@ -1147,4 +1159,19 @@
throw new CoolException(locDetl.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
}
}
+
+ @Override
+ @Transactional
+ public List<Map<String, Object>> boxTypeComb() {
+ EntityWrapper<BasBoxType> wrapper = new EntityWrapper<>();
+ List<Map<String, Object>> result = new ArrayList<>();
+ List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(wrapper.orderBy("id",true));
+ for (BasBoxType basBoxType : basBoxTypes){
+ Map<String, Object> map = new HashMap<>();
+ map.put("boxType", basBoxType.getBoxType());
+ map.put("boxSpecs", basBoxType.getBoxSpecs());
+ result.add(map);
+ }
+ return result;
+ }
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 236a928..071344a 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -728,6 +728,8 @@
throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細姣涢噸 roughWeight");
}else if (Cools.isEmpty(matList.getRollExtent()) || matList.getRollExtent().equals(0D)){
throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鍗烽暱搴� rollExtent");
+ }else if (Cools.isEmpty(matList.getJoint()) || matList.getJoint()==0){
+ throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鎺ュご鏁� joint");
}
if (matList.getPosition().equals("1")){//1銆佸乏 2銆佸彸
diff --git a/src/main/java/com/zy/asrs/service/impl/RgvOneSignServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/RgvOneSignServiceImpl.java
new file mode 100644
index 0000000..91e6bfa
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/RgvOneSignServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.RgvOneSignMapper;
+import com.zy.asrs.entity.RgvOneSign;
+import com.zy.asrs.service.RgvOneSignService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("rgvOneSignService")
+public class RgvOneSignServiceImpl extends ServiceImpl<RgvOneSignMapper, RgvOneSign> implements RgvOneSignService {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index ccdb455..5ac75fc 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -970,7 +970,7 @@
locMast.setModiUser(userId);
locMastService.updateById(locMast);
}
- } else if (wrkMast.getIoType()==202){
+ } else if (wrkMast.getIoType()==202 || wrkMast.getIoType()==212){
} else {
throw new CoolException("褰撳墠宸ヤ綔鐘舵�佹棤娉曞彇娑�");
}
@@ -1058,7 +1058,7 @@
// 鍒犻櫎宸ヤ綔妗ｆ槑缁�
boolean wrkDetlRes = wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", workNo));
}
- if (wrkMast.getIoType()==202){
+ if (wrkMast.getIoType()==202 || wrkMast.getIoType()==212){
return;
}
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
index efe3064..df199ef 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -44,7 +44,7 @@
private void execute(){
for(Integer staNo : STA_WORK_CU){
BasDevp basDevp = basDevpService.selectById(staNo);
- if (basDevp.getWrkNo()!=0){
+ if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
if(Cools.isEmpty(wrkMast)){
continue;
@@ -86,7 +86,7 @@
for(Integer staNo : STA_WORK_RU){
BasDevp basDevp = basDevpService.selectById(staNo);
- if (basDevp.getWrkNo()!=0){
+ if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
if (wrkMast.getWrkSts()!=2 || wrkMast.getIoType()==10){
continue;
diff --git a/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java b/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
index 4e5ebbd..d17771d 100644
--- a/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
@@ -64,7 +64,7 @@
if (!basDevpEnd.getLoading().equals("Y") || !basDevpEnd.getAutoing().equals("Y") || !basDevpEnd.getInEnable().equals("Y")){
return FAIL;
}
- if ((basDevpEnd.getWrkNo()<9900 && basDevpEnd.getWrkNo()!=0 ) || basDevpEnd.getWrkNo()>10000 || basDevpEnd.getReportSign()!=0){
+ if ((basDevpEnd.getWrkNo()<9900 && basDevpEnd.getWrkNo()!=0 ) || basDevpEnd.getWrkNo()>10000 || basDevpEnd.getReportSign()!=0){
return FAIL;
}
WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 202).eq("source_sta_no", staEnd).eq("wrk_sts",51L));
@@ -97,11 +97,11 @@
SingleMountUnstackingCompleteParam singleMountUnstackingCompleteParam = new SingleMountUnstackingCompleteParam(wrkMast,wrkDetlList);
singleMountUnstackingCompleteParam.setStaStart(staNo);
singleMountUnstackingCompleteParam.setStaEnd(staEnd);
- ReturnT<String> result = null;
- if (true){
- return FAIL;
- }
- result = postMesData(reportOutPath,singleMountUnstackingCompleteParam);
+// result = null;
+// if (true){
+// return FAIL;
+// }
+ ReturnT<String> result = postMesData(reportOutPath,singleMountUnstackingCompleteParam);
// System.out.println(result);
// if (true){
// for (WrkDetl wrkDetl:wrkDetls){
diff --git a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
index 2778157..d915152 100644
--- a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
@@ -79,7 +79,23 @@
LocDetlService locDetlService = SpringUtils.getBean(LocDetlService.class);
WorkService workService = SpringUtils.getBean(WorkService.class);
List<LocDto> locDtos = new ArrayList<>();
+ List<String[]> outLocBoxCList = new ArrayList<>();
+ List<String> outLocBoxCNew = new ArrayList<>();
for (String[] outLocBoxC:OutLocBoxCs){
+ if (!outLocBoxCNew.contains(outLocBoxC[0])){
+ LocDetl locDetlSou = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("batch", outLocBoxC[0]));
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
+ .eq("loc_no", locDetlSou.getLocNo()).eq("origin", locDetlSou.getOrigin()));
+ for (LocDetl locDetl:locDetls){
+ String[] locDetlNow=new String[2];
+ locDetlNow[0] = locDetl.getBatch();
+ locDetlNow[1] = outLocBoxC[1];
+ outLocBoxCList.add(locDetlNow);
+ outLocBoxCNew.add(outLocBoxC[0]);
+ }
+ }
+ }
+ for (String[] outLocBoxC:outLocBoxCList){
LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("batch", outLocBoxC[0]));
if (Cools.isEmpty(locDetl)){
total--;
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index a533c00..6f55f86 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="127.0.0.1:1433;databasename=srjtasrs";
generator.username="sa";
generator.password="sa@123";
- generator.table="asr_wrk_mast_sta_log";
+ generator.table="bas_rgv_one_sign";
generator.packagePath="com.zy.asrs";
generator.build();
}
diff --git a/src/main/java/rgvOneSign.sql b/src/main/java/rgvOneSign.sql
new file mode 100644
index 0000000..1b2d811
--- /dev/null
+++ b/src/main/java/rgvOneSign.sql
@@ -0,0 +1,18 @@
+-- save rgvOneSign record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'rgvOneSign/rgvOneSign.html', 'rgvOneSign绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'rgvOneSign#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'rgvOneSign#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'rgvOneSign#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'rgvOneSign#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'rgvOneSign#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'rgvOneSign/rgvOneSign.html', N'rgvOneSign绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'rgvOneSign#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'rgvOneSign#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'rgvOneSign#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'rgvOneSign#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'rgvOneSign#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/resources/mapper/BasBoxTypeMapper.xml b/src/main/resources/mapper/BasBoxTypeMapper.xml
new file mode 100644
index 0000000..18259be
--- /dev/null
+++ b/src/main/resources/mapper/BasBoxTypeMapper.xml
@@ -0,0 +1,13 @@
+<?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.BasBoxTypeMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasBoxType">
+ <id column="id" property="id" />
+ <result column="box_specs" property="boxSpecs" />
+ <result column="box_type" property="boxType" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/RgvOneSignMapper.xml b/src/main/resources/mapper/RgvOneSignMapper.xml
new file mode 100644
index 0000000..fd6cc5f
--- /dev/null
+++ b/src/main/resources/mapper/RgvOneSignMapper.xml
@@ -0,0 +1,13 @@
+<?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.RgvOneSignMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.RgvOneSign">
+ <id column="id" property="id" />
+ <result column="rgv_one_sign" property="rgvOneSign" />
+ <result column="rgv_one_type" property="rgvOneType" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/basBoxType/basBoxType.js b/src/main/webapp/static/js/basBoxType/basBoxType.js
new file mode 100644
index 0000000..480c069
--- /dev/null
+++ b/src/main/webapp/static/js/basBoxType/basBoxType.js
@@ -0,0 +1,247 @@
+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: '#basBoxType',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/basBoxType/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ // {type: 'checkbox'},
+ {field: 'id', align: 'center',title: 'ID' ,hide : true},
+ {field: 'boxSpecs', align: 'center',title: '绠卞瀷',hide : false}
+ ,{field: 'boxType', align: 'center',title: '绠卞瀷缂栧彿',hide : false}
+
+ ,{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(basBoxType)', 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(basBoxType)', 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 = {
+ 'basBoxType': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/basBoxType/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(basBoxType)', 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+"/basBoxType/"+(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+"/basBoxType/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
+ });
+
+ }, 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/rgvOneSign/rgvOneSign.js b/src/main/webapp/static/js/rgvOneSign/rgvOneSign.js
new file mode 100644
index 0000000..39ff6af
--- /dev/null
+++ b/src/main/webapp/static/js/rgvOneSign/rgvOneSign.js
@@ -0,0 +1,246 @@
+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: '#rgvOneSign',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/rgvOneSign/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: 'ragOneSign', 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(rgvOneSign)', 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(rgvOneSign)', 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 = {
+ 'rgvOneSign': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/rgvOneSign/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(rgvOneSign)', 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+"/rgvOneSign/"+(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+"/rgvOneSign/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
+ });
+
+ }, 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/basBoxType/basBoxType.html b/src/main/webapp/views/basBoxType/basBoxType.html
new file mode 100644
index 0000000..3f55399
--- /dev/null
+++ b/src/main/webapp/views/basBoxType/basBoxType.html
@@ -0,0 +1,98 @@
+<!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="basBoxType" lay-filter="basBoxType"></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/basBoxType/basBoxType.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="boxSpecs" 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">
+ <input class="layui-input" name="boxType" 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/index.html b/src/main/webapp/views/index.html
index 3d177c6..1008bf5 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -75,7 +75,7 @@
<div class="layui-body"></div>
<!-- 搴曢儴 -->
<div class="layui-footer layui-text">
- copyright 漏 2022 <a href="https://zoneyung.com/" target="_blank">寰愬伐姹変簯</a> all rights reserved.
+ copyright 漏 2023 <a href="https://zoneyung.com/" target="_blank">寰愬伐姹変簯</a> all rights reserved.
<span class="pull-right">Version 1.0.0</span>
</div>
diff --git a/src/main/webapp/views/login.html b/src/main/webapp/views/login.html
index d5e6dd2..211c881 100644
--- a/src/main/webapp/views/login.html
+++ b/src/main/webapp/views/login.html
@@ -57,7 +57,7 @@
</div>
<div class="p-sketch-outline">
<h2 class="p-sketch-outline__title">Automatic Storage and Retrieval System</h2>
- <p class="p-sketch-outline__date">posted: 2018.01.01 / update: 2022.09.21
+ <p class="p-sketch-outline__date">posted: 2023.01.01 / update: 2024.01.21
</p>
<p class="p-sketch-outline__description">wms made with various simple objects.</p>
</div>
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 8a5aeb5..48c2868 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -90,8 +90,9 @@
</div>
<div class="layui-card">
<div class="layui-card-body">
- 鍏ュ簱閫氱煡鍗曪細鐢盓RP鎻愪緵鍗曟嵁缂栧彿銆佺被鍨嬨�佸崟鎹椂闂村強鐗╂枡鏄庣粏锛岀敓鎴愬叆搴撲綔涓氬崟锛屼负缁存姢绯荤粺楂樺彲鐢紝鐢ㄦ埛鍙嚜琛屾坊鍔犲叆搴撻�氱煡鍗曟暟鎹紝瀹屾垚鐙珛鐨勫叆搴撲綔涓氥��
- <span class="text-danger">鎵嬪姩娣诲姞鏃讹紝璇锋鏌ュ崟鎹紪鍙锋槸鍚﹀湪ERP绯荤粺涓凡瀛樺湪锛岄伩鍏嶅彂鐢熸暟鎹敊璇棶棰樸��</span>
+<!-- 鍏ュ簱閫氱煡鍗曪細鐢盓RP鎻愪緵鍗曟嵁缂栧彿銆佺被鍨嬨�佸崟鎹椂闂村強鐗╂枡鏄庣粏锛岀敓鎴愬叆搴撲綔涓氬崟锛屼负缁存姢绯荤粺楂樺彲鐢紝鐢ㄦ埛鍙嚜琛屾坊鍔犲叆搴撻�氱煡鍗曟暟鎹紝瀹屾垚鐙珛鐨勫叆搴撲綔涓氥��-->
+<!-- <span class="text-danger">鎵嬪姩娣诲姞鏃讹紝璇锋鏌ュ崟鎹紪鍙锋槸鍚﹀湪ERP绯荤粺涓凡瀛樺湪锛岄伩鍏嶅彂鐢熸暟鎹敊璇棶棰樸��</span>-->
+ <span class="text-danger">鍑哄簱鏃讹紝璇锋鏌ュ崟鎹紪鍙锋槸鍚﹀湪绯荤粺涓凡瀛樺湪锛岄伩鍏嶅彂鐢熸暟鎹敊璇棶棰樸��</span>
</div>
</div>
</div>
diff --git a/src/main/webapp/views/rgvOneSign/rgvOneSign.html b/src/main/webapp/views/rgvOneSign/rgvOneSign.html
new file mode 100644
index 0000000..266fe21
--- /dev/null
+++ b/src/main/webapp/views/rgvOneSign/rgvOneSign.html
@@ -0,0 +1,92 @@
+<!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="rgvOneSign" lay-filter="rgvOneSign"></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/rgvOneSign/rgvOneSign.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="ragOneSign" placeholder="璇疯緭鍏ュ唴瀹�" lay-vertype="tips" lay-verify="required">
+ </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