From 80f37c8f3db71842415a4a591c31b7d8570c8604 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 08 九月 2025 15:44:24 +0800
Subject: [PATCH] *
---
src/main/webapp/views/basArmMast/basArmMast.html | 188 ++++++
src/main/java/basArmRules.sql | 18
src/main/java/com/zy/asrs/entity/BasArmMast.java | 165 ++++++
src/main/java/com/zy/asrs/mapper/BasArmRulesMapper.java | 12
src/main/resources/mapper/BasArmMastMapper.xml | 28 +
src/main/webapp/views/basArmRules/basArmRules.html | 122 ++++
src/main/java/com/zy/asrs/service/BasArmMastService.java | 8
src/main/java/com/zy/asrs/entity/BasArmRules.java | 91 +++
src/main/java/com/zy/asrs/mapper/BasArmMastMapper.java | 12
src/main/java/com/zy/asrs/controller/BasArmRulesController.java | 171 ++++++
src/main/java/com/zy/asrs/service/BasArmRulesService.java | 8
src/main/java/com/zy/common/CodeBuilder.java | 6
src/main/java/com/zy/asrs/service/impl/BasArmMastServiceImpl.java | 12
src/main/resources/mapper/BasArmRulesMapper.xml | 17
src/main/webapp/static/js/basArmRules/basArmRules.js | 251 +++++++++
src/main/java/com/zy/asrs/service/impl/BasArmRulesServiceImpl.java | 12
src/main/java/basArmMast.sql | 18
src/main/java/com/zy/asrs/controller/BasArmMastController.java | 171 ++++++
src/main/webapp/static/js/basArmMast/basArmMast.js | 262 +++++++++
src/main/resources/application.yml | 5
20 files changed, 1,574 insertions(+), 3 deletions(-)
diff --git a/src/main/java/basArmMast.sql b/src/main/java/basArmMast.sql
new file mode 100644
index 0000000..655aaec
--- /dev/null
+++ b/src/main/java/basArmMast.sql
@@ -0,0 +1,18 @@
+-- save basArmMast record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basArmMast/basArmMast.html', 'basArmMast绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basArmMast#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basArmMast#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basArmMast#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basArmMast#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basArmMast#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArmMast/basArmMast.html', N'basArmMast绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArmMast#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArmMast#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArmMast#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArmMast#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArmMast#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/java/basArmRules.sql b/src/main/java/basArmRules.sql
new file mode 100644
index 0000000..2e020d7
--- /dev/null
+++ b/src/main/java/basArmRules.sql
@@ -0,0 +1,18 @@
+-- save basArmRules record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basArmRules/basArmRules.html', 'basArmRules绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basArmRules#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basArmRules#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basArmRules#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basArmRules#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basArmRules#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArmRules/basArmRules.html', N'basArmRules绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArmRules#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArmRules#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArmRules#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArmRules#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArmRules#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/java/com/zy/asrs/controller/BasArmMastController.java b/src/main/java/com/zy/asrs/controller/BasArmMastController.java
new file mode 100644
index 0000000..aaa82ba
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasArmMastController.java
@@ -0,0 +1,171 @@
+package com.zy.asrs.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotations.TableField;
+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.BasArmMast;
+import com.zy.asrs.service.BasArmMastService;
+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.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.*;
+
+@RestController
+public class BasArmMastController extends BaseController {
+
+ protected static final String RANGE_TIME_LINK = " - ";
+
+ @Autowired
+ private BasArmMastService basArmMastService;
+
+ @RequestMapping(value = "/basArmMast/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(basArmMastService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/basArmMast/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<BasArmMast> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(BasArmMast.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(basArmMastService.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 = "/basArmMast/add/auth")
+ @ManagerAuth
+ public R add(BasArmMast basArmMast) {
+ basArmMastService.insert(basArmMast);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basArmMast/update/auth")
+ @ManagerAuth
+ public R update(BasArmMast basArmMast){
+ if (Cools.isEmpty(basArmMast) || null==basArmMast.getId()){
+ return R.error();
+ }
+ basArmMastService.updateById(basArmMast);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basArmMast/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ basArmMastService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basArmMast/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<BasArmMast> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("basArmMast"));
+ convert(map, wrapper);
+ List<BasArmMast> list = basArmMastService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/basArmMastQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<BasArmMast> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<BasArmMast> page = basArmMastService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (BasArmMast basArmMast : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", basArmMast.getId());
+ map.put("value", basArmMast.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/basArmMast/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<BasArmMast> wrapper = new EntityWrapper<BasArmMast>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basArmMastService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(BasArmMast.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+ /**
+ * 鍏ㄥ瓧娈垫ā绯婃悳绱�
+ * @param cls 妯″瀷绫�
+ * @param set 鎺掗櫎瀛楁闆嗗悎
+ * @param condition 鎼滅储鍐呭
+ */
+ protected <T> void allLike(Class<T> cls, Set<String> set, EntityWrapper<T> wrapper, String condition){
+ if (Cools.isEmpty(condition)) {
+ return;
+ }
+ List<String> columns = new ArrayList<>();
+ for (Field field :Cools.getAllFields(cls)){
+ if (Modifier.isFinal(field.getModifiers())
+ || Modifier.isStatic(field.getModifiers())
+ || Modifier.isTransient(field.getModifiers())){
+ continue;
+ }
+ String column = null;
+ if (field.isAnnotationPresent(TableField.class)) {
+ column = field.getAnnotation(TableField.class).value();
+ }
+ if (Cools.isEmpty(column)) {
+ column = field.getName();
+ }
+ if (!set.contains(column)) {
+ columns.add(column);
+ }
+ }
+ if (columns.isEmpty()) {
+ return;
+ }
+ for (int i=0;i<columns.size();i++){
+ if (i==0){
+ wrapper.andNew();
+ } else {
+ wrapper.or();
+ }
+ wrapper.like(columns.get(i), condition);
+ }
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/controller/BasArmRulesController.java b/src/main/java/com/zy/asrs/controller/BasArmRulesController.java
new file mode 100644
index 0000000..86ab31b
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasArmRulesController.java
@@ -0,0 +1,171 @@
+package com.zy.asrs.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotations.TableField;
+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.BasArmRules;
+import com.zy.asrs.service.BasArmRulesService;
+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.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.*;
+
+@RestController
+public class BasArmRulesController extends BaseController {
+
+ protected static final String RANGE_TIME_LINK = " - ";
+
+ @Autowired
+ private BasArmRulesService basArmRulesService;
+
+ @RequestMapping(value = "/basArmRules/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(basArmRulesService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/basArmRules/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<BasArmRules> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(BasArmRules.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(basArmRulesService.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 = "/basArmRules/add/auth")
+ @ManagerAuth
+ public R add(BasArmRules basArmRules) {
+ basArmRulesService.insert(basArmRules);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basArmRules/update/auth")
+ @ManagerAuth
+ public R update(BasArmRules basArmRules){
+ if (Cools.isEmpty(basArmRules) || null==basArmRules.getId()){
+ return R.error();
+ }
+ basArmRulesService.updateById(basArmRules);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basArmRules/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ basArmRulesService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basArmRules/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<BasArmRules> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("basArmRules"));
+ convert(map, wrapper);
+ List<BasArmRules> list = basArmRulesService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/basArmRulesQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<BasArmRules> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<BasArmRules> page = basArmRulesService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (BasArmRules basArmRules : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", basArmRules.getId());
+ map.put("value", basArmRules.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/basArmRules/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<BasArmRules> wrapper = new EntityWrapper<BasArmRules>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basArmRulesService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(BasArmRules.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+ /**
+ * 鍏ㄥ瓧娈垫ā绯婃悳绱�
+ * @param cls 妯″瀷绫�
+ * @param set 鎺掗櫎瀛楁闆嗗悎
+ * @param condition 鎼滅储鍐呭
+ */
+ protected <T> void allLike(Class<T> cls, Set<String> set, EntityWrapper<T> wrapper, String condition){
+ if (Cools.isEmpty(condition)) {
+ return;
+ }
+ List<String> columns = new ArrayList<>();
+ for (Field field :Cools.getAllFields(cls)){
+ if (Modifier.isFinal(field.getModifiers())
+ || Modifier.isStatic(field.getModifiers())
+ || Modifier.isTransient(field.getModifiers())){
+ continue;
+ }
+ String column = null;
+ if (field.isAnnotationPresent(TableField.class)) {
+ column = field.getAnnotation(TableField.class).value();
+ }
+ if (Cools.isEmpty(column)) {
+ column = field.getName();
+ }
+ if (!set.contains(column)) {
+ columns.add(column);
+ }
+ }
+ if (columns.isEmpty()) {
+ return;
+ }
+ for (int i=0;i<columns.size();i++){
+ if (i==0){
+ wrapper.andNew();
+ } else {
+ wrapper.or();
+ }
+ wrapper.like(columns.get(i), condition);
+ }
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/BasArmMast.java b/src/main/java/com/zy/asrs/entity/BasArmMast.java
new file mode 100644
index 0000000..c4f6ee3
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasArmMast.java
@@ -0,0 +1,165 @@
+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 io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("asr_bas_arm_mast")
+public class BasArmMast implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ private Long id;
+
+ /**
+ * 鏈烘鑷傜紪鍙�
+ */
+ @ApiModelProperty(value= "鏈烘鑷傜紪鍙�")
+ @TableId(value = "arm_no", type = IdType.INPUT)
+ @TableField("arm_no")
+ private Integer armNo;
+
+ /**
+ * 鎿嶄綔鏂瑰悜
+ */
+ @ApiModelProperty(value= "鎿嶄綔鏂瑰悜")
+ @TableField("arm_direction")
+ private Integer armDirection;
+
+ /**
+ * 缁堢偣
+ */
+ @ApiModelProperty(value= "缁堢偣")
+ @TableField("sta_no")
+ private Integer staNo;
+
+ /**
+ * 璧风偣
+ */
+ @ApiModelProperty(value= "璧风偣")
+ @TableId(value = "sorting_line", type = IdType.INPUT)
+ @TableField("sorting_line")
+ private Integer sortingLine;
+
+ /**
+ * 缁戝畾鏍囪
+ */
+ @ApiModelProperty(value= "缁戝畾鏍囪")
+ @TableField("binding_tags")
+ private Integer bindingTags;
+
+ /**
+ * 浼樺厛绾�
+ */
+ @ApiModelProperty(value= "浼樺厛绾�")
+ private Long priority;
+
+ /**
+ * 鐘舵��
+ */
+ @ApiModelProperty(value= "鐘舵��")
+ private Integer status;
+
+ @ApiModelProperty(value= "")
+ private String matnr;
+
+ @ApiModelProperty(value= "")
+ private String sku;
+
+ @ApiModelProperty(value= "")
+ private String po;
+
+ @ApiModelProperty(value= "")
+ private String upc;
+
+ /**
+ * 璐ф簮
+ */
+ @ApiModelProperty(value= "璐ф簮")
+ private String supplier;
+
+ @ApiModelProperty(value= "")
+ @TableField("order_no")
+ private String orderNo;
+
+ /**
+ * 绠辨暟
+ */
+ @ApiModelProperty(value= "绠辨暟")
+ private Integer ctns;
+
+ /**
+ * 鏃堕棿鎴�
+ */
+ @ApiModelProperty(value= "鏃堕棿鎴�")
+ @TableId(value = "createTime", type = IdType.INPUT)
+ private Long createTime;
+
+ /**
+ * 寮傚父浠ｇ爜
+ */
+ @ApiModelProperty(value= "寮傚父浠ｇ爜")
+ @TableField("arm_error")
+ private Long armError;
+
+ /**
+ * 寮傚父淇℃伅
+ */
+ @ApiModelProperty(value= "寮傚父淇℃伅")
+ @TableField("arm_msg")
+ private String armMsg;
+
+ public BasArmMast() {}
+
+ public BasArmMast(Integer armNo,Integer armDirection,Integer staNo,Integer sortingLine,Integer bindingTags,Long priority,Integer status,String matnr,String sku,String po,String upc,String supplier,String orderNo,Integer ctns,Long createTime,Long armError,String armMsg) {
+ this.armNo = armNo;
+ this.armDirection = armDirection;
+ this.staNo = staNo;
+ this.sortingLine = sortingLine;
+ this.bindingTags = bindingTags;
+ this.priority = priority;
+ this.status = status;
+ this.matnr = matnr;
+ this.sku = sku;
+ this.po = po;
+ this.upc = upc;
+ this.supplier = supplier;
+ this.orderNo = orderNo;
+ this.ctns = ctns;
+ this.createTime = createTime;
+ this.armError = armError;
+ this.armMsg = armMsg;
+ }
+
+// BasArmMast basArmMast = new BasArmMast(
+// null, // 鏈烘鑷傜紪鍙穂闈炵┖]
+// null, // 鎿嶄綔鏂瑰悜[闈炵┖]
+// null, // 缁堢偣[闈炵┖]
+// null, // 璧风偣[闈炵┖]
+// null, // 缁戝畾鏍囪[闈炵┖]
+// null, // 浼樺厛绾闈炵┖]
+// null, // 鐘舵�乕闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // 璐ф簮[闈炵┖]
+// null, // [闈炵┖]
+// null, // 绠辨暟[闈炵┖]
+// null, // 鏃堕棿鎴砙闈炵┖]
+// null, // 寮傚父浠ｇ爜
+// null // 寮傚父淇℃伅
+// );
+
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/BasArmRules.java b/src/main/java/com/zy/asrs/entity/BasArmRules.java
new file mode 100644
index 0000000..e5835cd
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasArmRules.java
@@ -0,0 +1,91 @@
+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 io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("asr_bas_arm_rules")
+public class BasArmRules implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ private Long id;
+
+ /**
+ * 闀垮害.鍗曚綅锛歮m
+ */
+ @ApiModelProperty(value= "闀垮害.鍗曚綅锛歮m")
+ @TableId(value = "material_length", type = IdType.INPUT)
+ @TableField("material_length")
+ private Double materialLength;
+
+ /**
+ * 瀹藉害.鍗曚綅锛歮m
+ */
+ @ApiModelProperty(value= "瀹藉害.鍗曚綅锛歮m")
+ @TableId(value = "material_width", type = IdType.INPUT)
+ @TableField("material_width")
+ private Double materialWidth;
+
+ /**
+ * 楂樺害.鍗曚綅锛歮m
+ */
+ @ApiModelProperty(value= "楂樺害.鍗曚綅锛歮m")
+ @TableId(value = "material_height", type = IdType.INPUT)
+ @TableField("material_height")
+ private Double materialHeight;
+
+ /**
+ * 閲嶉噺.鍗曚綅锛歬g
+ */
+ @ApiModelProperty(value= "閲嶉噺.鍗曚綅锛歬g")
+ @TableId(value = "material_weight", type = IdType.INPUT)
+ @TableField("material_weight")
+ private Double materialWeight;
+
+ /**
+ * 浣撶Н(绔嬫柟姣背)
+ */
+ @ApiModelProperty(value= "浣撶Н(绔嬫柟姣背)")
+ @TableField("material_volume")
+ private Double materialVolume;
+
+ /**
+ * 婊℃墭鏁伴噺
+ */
+ @ApiModelProperty(value= "婊℃墭鏁伴噺")
+ @TableField("material_number")
+ private Integer materialNumber;
+
+ public BasArmRules() {}
+
+ public BasArmRules(Double materialLength,Double materialWidth,Double materialHeight,Double materialWeight,Double materialVolume,Integer materialNumber) {
+ this.materialLength = materialLength;
+ this.materialWidth = materialWidth;
+ this.materialHeight = materialHeight;
+ this.materialWeight = materialWeight;
+ this.materialVolume = materialVolume;
+ this.materialNumber = materialNumber;
+ }
+
+// BasArmRules basArmRules = new BasArmRules(
+// null, // 闀垮害.鍗曚綅锛歮m[闈炵┖]
+// null, // 瀹藉害.鍗曚綅锛歮m[闈炵┖]
+// null, // 楂樺害.鍗曚綅锛歮m[闈炵┖]
+// null, // 閲嶉噺.鍗曚綅锛歬g[闈炵┖]
+// null, // 浣撶Н(绔嬫柟姣背)[闈炵┖]
+// null // 婊℃墭鏁伴噺[闈炵┖]
+// );
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/BasArmMastMapper.java b/src/main/java/com/zy/asrs/mapper/BasArmMastMapper.java
new file mode 100644
index 0000000..264ce36
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasArmMastMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.BasArmMast;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasArmMastMapper extends BaseMapper<BasArmMast> {
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/BasArmRulesMapper.java b/src/main/java/com/zy/asrs/mapper/BasArmRulesMapper.java
new file mode 100644
index 0000000..13bea65
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasArmRulesMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.BasArmRules;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasArmRulesMapper extends BaseMapper<BasArmRules> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/BasArmMastService.java b/src/main/java/com/zy/asrs/service/BasArmMastService.java
new file mode 100644
index 0000000..bbf8883
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasArmMastService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.BasArmMast;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface BasArmMastService extends IService<BasArmMast> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/BasArmRulesService.java b/src/main/java/com/zy/asrs/service/BasArmRulesService.java
new file mode 100644
index 0000000..dac7707
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasArmRulesService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.BasArmRules;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface BasArmRulesService extends IService<BasArmRules> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasArmMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasArmMastServiceImpl.java
new file mode 100644
index 0000000..7ac81d6
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasArmMastServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.BasArmMastMapper;
+import com.zy.asrs.entity.BasArmMast;
+import com.zy.asrs.service.BasArmMastService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("basArmMastService")
+public class BasArmMastServiceImpl extends ServiceImpl<BasArmMastMapper, BasArmMast> implements BasArmMastService {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasArmRulesServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasArmRulesServiceImpl.java
new file mode 100644
index 0000000..f95678e
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasArmRulesServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.BasArmRulesMapper;
+import com.zy.asrs.entity.BasArmRules;
+import com.zy.asrs.service.BasArmRulesService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("basArmRulesService")
+public class BasArmRulesServiceImpl extends ServiceImpl<BasArmRulesMapper, BasArmRules> implements BasArmRulesService {
+
+}
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index d2c576a..e6b7e69 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -1,6 +1,7 @@
package com.zy.common;
import com.core.generators.CoolGenerator;
+import com.core.generators.constant.SqlOsType;
/**
* Created by vincent on 2019-06-04
@@ -15,10 +16,11 @@
// generator.password="xltys1995";
// generator.table="sys_host";
// sqlserver
- generator.url="192.168.3.208:1433;databasename=cool";
+ generator.sqlOsType = SqlOsType.SQL_SERVER;
+ generator.url="192.168.4.191:50948;databasename=jshdasrs";
generator.username="sa";
generator.password="sa@123";
- generator.table="asr_wrk_detl";
+ generator.table="asr_bas_arm_mast_log";
generator.packagePath="com.zy.asrs";
generator.build();
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ba72fab..27da1b8 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,9 +8,12 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=jshdasrs
+# url: jdbc:sqlserver://localhost:1433;databasename=jshdasrs
username: sa
password: sa@123
+ url: jdbc:sqlserver://192.168.4.191:50948;databasename=jshdasrs
+# username: sa
+# password: sa@123
mvc:
static-path-pattern: /**
redis:
diff --git a/src/main/resources/mapper/BasArmMastMapper.xml b/src/main/resources/mapper/BasArmMastMapper.xml
new file mode 100644
index 0000000..777e018
--- /dev/null
+++ b/src/main/resources/mapper/BasArmMastMapper.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.mapper.BasArmMastMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasArmMast">
+ <id column="id" property="id" />
+ <result column="arm_no" property="armNo" />
+ <result column="arm_direction" property="armDirection" />
+ <result column="sta_no" property="staNo" />
+ <result column="sorting_line" property="sortingLine" />
+ <result column="binding_tags" property="bindingTags" />
+ <result column="priority" property="priority" />
+ <result column="status" property="status" />
+ <result column="matnr" property="matnr" />
+ <result column="sku" property="sku" />
+ <result column="po" property="po" />
+ <result column="upc" property="upc" />
+ <result column="supplier" property="supplier" />
+ <result column="order_no" property="orderNo" />
+ <result column="ctns" property="ctns" />
+ <result column="createTime" property="createTime" />
+ <result column="arm_error" property="armError" />
+ <result column="arm_msg" property="armMsg" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/BasArmRulesMapper.xml b/src/main/resources/mapper/BasArmRulesMapper.xml
new file mode 100644
index 0000000..19c388c
--- /dev/null
+++ b/src/main/resources/mapper/BasArmRulesMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.mapper.BasArmRulesMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasArmRules">
+ <id column="id" property="id" />
+ <result column="material_length" property="materialLength" />
+ <result column="material_width" property="materialWidth" />
+ <result column="material_height" property="materialHeight" />
+ <result column="material_weight" property="materialWeight" />
+ <result column="material_volume" property="materialVolume" />
+ <result column="material_number" property="materialNumber" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/basArmMast/basArmMast.js b/src/main/webapp/static/js/basArmMast/basArmMast.js
new file mode 100644
index 0000000..5f9cc4d
--- /dev/null
+++ b/src/main/webapp/static/js/basArmMast/basArmMast.js
@@ -0,0 +1,262 @@
+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: '#basArmMast',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/basArmMast/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'id', align: 'center',title: 'ID'}
+ ,{field: 'armNo', align: 'center',title: '鏈烘鑷傜紪鍙�'}
+ ,{field: 'armDirection', align: 'center',title: '鎿嶄綔鏂瑰悜'}
+ ,{field: 'staNo', align: 'center',title: '缁堢偣'}
+ ,{field: 'sortingLine', align: 'center',title: '璧风偣'}
+ ,{field: 'bindingTags', align: 'center',title: '缁戝畾鏍囪'}
+ ,{field: 'priority', align: 'center',title: '浼樺厛绾�'}
+ ,{field: 'status', align: 'center',title: '鐘舵��'}
+ ,{field: 'matnr', align: 'center',title: ''}
+ ,{field: 'sku', align: 'center',title: ''}
+ ,{field: 'po', align: 'center',title: ''}
+ ,{field: 'upc', align: 'center',title: ''}
+ ,{field: 'supplier', align: 'center',title: '璐ф簮'}
+ ,{field: 'orderNo', align: 'center',title: ''}
+ ,{field: 'ctns', align: 'center',title: '绠辨暟'}
+ ,{field: 'createTime', align: 'center',title: '鏃堕棿鎴�'}
+ ,{field: 'armError', align: 'center',title: '寮傚父浠ｇ爜'}
+ ,{field: 'armMsg', 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(basArmMast)', 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(basArmMast)', 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 = {
+ 'basArmMast': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/basArmMast/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(basArmMast)', 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+"/basArmMast/"+(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+"/basArmMast/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/basArmRules/basArmRules.js b/src/main/webapp/static/js/basArmRules/basArmRules.js
new file mode 100644
index 0000000..aab18ba
--- /dev/null
+++ b/src/main/webapp/static/js/basArmRules/basArmRules.js
@@ -0,0 +1,251 @@
+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: '#basArmRules',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/basArmRules/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'id', align: 'center',title: 'ID'}
+ ,{field: 'materialLength', align: 'center',title: '闀垮害.鍗曚綅锛歮m'}
+ ,{field: 'materialWidth', align: 'center',title: '瀹藉害.鍗曚綅锛歮m'}
+ ,{field: 'materialHeight', align: 'center',title: '楂樺害.鍗曚綅锛歮m'}
+ ,{field: 'materialWeight', align: 'center',title: '閲嶉噺.鍗曚綅锛歬g'}
+ ,{field: 'materialVolume', align: 'center',title: '浣撶Н(绔嬫柟姣背)'}
+ ,{field: 'materialNumber', 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(basArmRules)', 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(basArmRules)', 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 = {
+ 'basArmRules': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/basArmRules/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(basArmRules)', 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+"/basArmRules/"+(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+"/basArmRules/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/basArmMast/basArmMast.html b/src/main/webapp/views/basArmMast/basArmMast.html
new file mode 100644
index 0000000..4cffdde
--- /dev/null
+++ b/src/main/webapp/views/basArmMast/basArmMast.html
@@ -0,0 +1,188 @@
+<!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="basArmMast" lay-filter="basArmMast"></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/basArmMast/basArmMast.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="armNo" placeholder="璇疯緭鍏ユ満姊拌噦缂栧彿" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鎿嶄綔鏂瑰悜: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="armDirection" placeholder="璇疯緭鍏ユ搷浣滄柟鍚�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">缁堢偣: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="staNo" placeholder="璇疯緭鍏ョ粓鐐�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">璧风偣: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="sortingLine" placeholder="璇疯緭鍏ヨ捣鐐�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">缁戝畾鏍囪: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="bindingTags" placeholder="璇疯緭鍏ョ粦瀹氭爣璁�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">浼樺厛绾�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="priority" placeholder="璇疯緭鍏ヤ紭鍏堢骇" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鐘舵��: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="status" placeholder="璇疯緭鍏ョ姸鎬�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="matnr" placeholder="璇疯緭鍏�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="sku" placeholder="璇疯緭鍏�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="po" placeholder="璇疯緭鍏�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="upc" placeholder="璇疯緭鍏�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">璐ф簮: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="supplier" placeholder="璇疯緭鍏ヨ揣婧�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="orderNo" placeholder="璇疯緭鍏�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">绠辨暟: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="ctns" placeholder="璇疯緭鍏ョ鏁�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鏃堕棿鎴�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="createTime" 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="armError" placeholder="璇疯緭鍏ュ紓甯镐唬鐮�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">寮傚父淇℃伅: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="armMsg" 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/basArmRules/basArmRules.html b/src/main/webapp/views/basArmRules/basArmRules.html
new file mode 100644
index 0000000..686f09f
--- /dev/null
+++ b/src/main/webapp/views/basArmRules/basArmRules.html
@@ -0,0 +1,122 @@
+<!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="basArmRules" lay-filter="basArmRules"></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/basArmRules/basArmRules.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">闀垮害.鍗曚綅锛歮m: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="materialLength" placeholder="璇疯緭鍏ラ暱搴�.鍗曚綅锛歮m" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">瀹藉害.鍗曚綅锛歮m: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="materialWidth" placeholder="璇疯緭鍏ュ搴�.鍗曚綅锛歮m" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">楂樺害.鍗曚綅锛歮m: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="materialHeight" placeholder="璇疯緭鍏ラ珮搴�.鍗曚綅锛歮m" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">閲嶉噺.鍗曚綅锛歬g: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="materialWeight" placeholder="璇疯緭鍏ラ噸閲�.鍗曚綅锛歬g" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">浣撶Н(绔嬫柟姣背): </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="materialVolume" placeholder="璇疯緭鍏ヤ綋绉�(绔嬫柟姣背)" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">婊℃墭鏁伴噺: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="materialNumber" 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