From 72403912dc984290de2ce7c812d3ae8ceda09bd4 Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期一, 29 九月 2025 13:38:47 +0800
Subject: [PATCH] *
---
src/main/resources/mapper/BasArmMastSignMapper.xml | 19 +
src/main/java/com/zy/asrs/controller/OpenController.java | 29 ++
src/main/java/com/zy/asrs/controller/BasArmMastSignController.java | 125 +++++++++
src/main/java/com/zy/asrs/service/OpenService.java | 1
src/main/java/com/zy/common/CodeBuilder.java | 4
src/main/java/com/zy/asrs/service/BasArmMastSignService.java | 8
src/main/webapp/views/basArmMastSign/basArmMastSign.html | 134 ++++++++++
src/main/java/basArmMastSign.sql | 18 +
src/main/java/com/zy/asrs/entity/BasArmMastSign.java | 85 ++++++
src/main/java/com/zy/asrs/mapper/BasArmMastSignMapper.java | 12
src/main/java/com/zy/asrs/service/impl/BasArmMastSignServiceImpl.java | 12
src/main/webapp/static/js/basArmMastSign/basArmMastSign.js | 253 +++++++++++++++++++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 27 ++
13 files changed, 725 insertions(+), 2 deletions(-)
diff --git a/src/main/java/basArmMastSign.sql b/src/main/java/basArmMastSign.sql
new file mode 100644
index 0000000..e9900d7
--- /dev/null
+++ b/src/main/java/basArmMastSign.sql
@@ -0,0 +1,18 @@
+-- save basArmMastSign record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basArmMastSign/basArmMastSign.html', 'basArmMastSign绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basArmMastSign#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basArmMastSign#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basArmMastSign#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basArmMastSign#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basArmMastSign#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArmMastSign/basArmMastSign.html', N'basArmMastSign绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArmMastSign#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArmMastSign#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArmMastSign#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArmMastSign#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArmMastSign#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/java/com/zy/asrs/controller/BasArmMastSignController.java b/src/main/java/com/zy/asrs/controller/BasArmMastSignController.java
new file mode 100644
index 0000000..5587145
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasArmMastSignController.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.BasArmMastSign;
+import com.zy.asrs.service.BasArmMastSignService;
+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 BasArmMastSignController extends BaseController {
+
+ @Autowired
+ private BasArmMastSignService basArmMastSignService;
+
+ @RequestMapping(value = "/basArmMastSign/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(basArmMastSignService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/basArmMastSign/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<BasArmMastSign> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(BasArmMastSign.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(basArmMastSignService.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 = "/basArmMastSign/add/auth")
+ @ManagerAuth
+ public R add(BasArmMastSign basArmMastSign) {
+ basArmMastSignService.insert(basArmMastSign);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basArmMastSign/update/auth")
+ @ManagerAuth
+ public R update(BasArmMastSign basArmMastSign){
+ if (Cools.isEmpty(basArmMastSign) || null==basArmMastSign.getId()){
+ return R.error();
+ }
+ basArmMastSignService.updateById(basArmMastSign);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basArmMastSign/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ basArmMastSignService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basArmMastSign/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<BasArmMastSign> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("basArmMastSign"));
+ convert(map, wrapper);
+ List<BasArmMastSign> list = basArmMastSignService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/basArmMastSignQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<BasArmMastSign> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<BasArmMastSign> page = basArmMastSignService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (BasArmMastSign basArmMastSign : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", basArmMastSign.getId());
+ map.put("value", basArmMastSign.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/basArmMastSign/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<BasArmMastSign> wrapper = new EntityWrapper<BasArmMastSign>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basArmMastSignService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(BasArmMastSign.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index ef22698..4d96559 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -364,4 +364,33 @@
return R.ok();
}
+
+
+ /**
+ * 鏄惁瀛樺湪鍚庣画鎵樼洏
+ */
+ @PostMapping("/arm/task/order_sign")
+ public synchronized R TaskArmWorkOrderSign(@RequestHeader(required = false) String appkey,
+ @RequestBody OrderArmEndParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getArm_no())) {
+ return R.error("鏈烘鑷傜紪鍙穂Arm_no]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getOrder_id())) {
+ return R.error("鍗曟嵁缂栧彿[order_id]涓嶈兘涓虹┖");
+ }
+ try{
+ param.OrderIdTwo(sign_arm_order,sign_arm_sku);
+ } catch (Exception e){
+ return R.error("鍗曟嵁缂栧彿[order_id]浠� "+sign_arm_sku+" 涓� "+sign_arm_order+" 浣滀负鎷嗗垎鏍囪鎷嗗垎澶辫触锛侊紒锛�");
+ }
+
+ boolean taskArmWorkOrderSign = openService.TaskArmWorkOrderSign(param);
+ return R.ok().add(taskArmWorkOrderSign);
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/entity/BasArmMastSign.java b/src/main/java/com/zy/asrs/entity/BasArmMastSign.java
new file mode 100644
index 0000000..f8535c7
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasArmMastSign.java
@@ -0,0 +1,85 @@
+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_sign")
+public class BasArmMastSign implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 鐘舵��
+ */
+ @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= "鍒嗘嫞鏍囪")
+ @TableField("create_time")
+ private Long createTime;
+
+ public BasArmMastSign() {}
+
+ public BasArmMastSign(Integer status,String matnr,String sku,String po,String upc,String supplier,String orderNo,Long createTime) {
+ this.status = status;
+ this.matnr = matnr;
+ this.sku = sku;
+ this.po = po;
+ this.upc = upc;
+ this.supplier = supplier;
+ this.orderNo = orderNo;
+ this.createTime = createTime;
+ }
+
+// BasArmMastSign basArmMastSign = new BasArmMastSign(
+// null, // 鐘舵�乕闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // 璐ф簮[闈炵┖]
+// null, // [闈炵┖]
+// null // 鍒嗘嫞鏍囪[闈炵┖]
+// );
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/BasArmMastSignMapper.java b/src/main/java/com/zy/asrs/mapper/BasArmMastSignMapper.java
new file mode 100644
index 0000000..122ac27
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasArmMastSignMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.BasArmMastSign;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasArmMastSignMapper extends BaseMapper<BasArmMastSign> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/BasArmMastSignService.java b/src/main/java/com/zy/asrs/service/BasArmMastSignService.java
new file mode 100644
index 0000000..9c1dde0
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasArmMastSignService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.BasArmMastSign;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface BasArmMastSignService extends IService<BasArmMastSign> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 6e72567..8cc84cc 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -48,4 +48,5 @@
void taskArmCycleResult(TaskArmCycleResultParam param);
void taskArmWorkspaceStatus(TaskArmWorkspaceStatusParam param);
void taskArmWorkOrderStatus(OrderArmEndParam param);
+ boolean TaskArmWorkOrderSign(OrderArmEndParam param);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasArmMastSignServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasArmMastSignServiceImpl.java
new file mode 100644
index 0000000..7e914f6
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasArmMastSignServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.BasArmMastSignMapper;
+import com.zy.asrs.entity.BasArmMastSign;
+import com.zy.asrs.service.BasArmMastSignService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("basArmMastSignService")
+public class BasArmMastSignServiceImpl extends ServiceImpl<BasArmMastSignMapper, BasArmMastSign> implements BasArmMastSignService {
+
+}
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 ec98a76..77c261b 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -56,6 +56,8 @@
private BasArmService basArmService;
@Autowired
private BasArmMastService basArmMastService;
+ @Autowired
+ private BasArmMastSignService basArmMastSignService;
@Override
@Transactional
@@ -692,4 +694,29 @@
}
}
+ @Override
+ @Transactional
+ public boolean TaskArmWorkOrderSign(OrderArmEndParam param) {
+ BasArmMastSign basArmMastSign = basArmMastSignService.selectOne(
+ new EntityWrapper<BasArmMastSign>()
+ .eq("matnr", param.getSku())
+ .eq("order_no", param.getOrderNo())
+ );
+ if (Cools.isEmpty(basArmMastSign)){
+// throw new CoolException("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
+ return false;
+ }
+ BasArmMastSign basArmMastSignNew = basArmMastSignService.selectOne(
+ new EntityWrapper<BasArmMastSign>()
+ .eq("matnr", param.getSku())
+ .eq("order_no", param.getOrderNo())
+ .eq("create_time", basArmMastSign.getCreateTime())
+ .eq("status", 0)
+ );
+ if (Cools.isEmpty(basArmMastSignNew)){
+ return false;
+ }
+ return true;
+ }
+
}
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index 8998eb4..9e65c97 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -17,10 +17,10 @@
// generator.table="sys_host";
// sqlserver
generator.sqlOsType = SqlOsType.SQL_SERVER;
- generator.url="192.168.4.191:50948;databasename=jshdasrs";
+ generator.url="10.10.10.235:1433;databasename=jshdasrs";
generator.username="sa";
generator.password="sa@123";
- generator.table="asr_bas_arm";
+ generator.table="asr_bas_arm_mast_sign";
generator.packagePath="com.zy.asrs";
generator.build();
}
diff --git a/src/main/resources/mapper/BasArmMastSignMapper.xml b/src/main/resources/mapper/BasArmMastSignMapper.xml
new file mode 100644
index 0000000..58704f4
--- /dev/null
+++ b/src/main/resources/mapper/BasArmMastSignMapper.xml
@@ -0,0 +1,19 @@
+<?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.BasArmMastSignMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasArmMastSign">
+ <id column="id" property="id" />
+ <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="create_time" property="createTime" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/basArmMastSign/basArmMastSign.js b/src/main/webapp/static/js/basArmMastSign/basArmMastSign.js
new file mode 100644
index 0000000..db021fa
--- /dev/null
+++ b/src/main/webapp/static/js/basArmMastSign/basArmMastSign.js
@@ -0,0 +1,253 @@
+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: '#basArmMastSign',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/basArmMastSign/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: '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: 'createTime', 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(basArmMastSign)', 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(basArmMastSign)', 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 = {
+ 'basArmMastSign': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/basArmMastSign/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(basArmMastSign)', 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+"/basArmMastSign/"+(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+"/basArmMastSign/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/basArmMastSign/basArmMastSign.html b/src/main/webapp/views/basArmMastSign/basArmMastSign.html
new file mode 100644
index 0000000..a451a53
--- /dev/null
+++ b/src/main/webapp/views/basArmMastSign/basArmMastSign.html
@@ -0,0 +1,134 @@
+<!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="basArmMastSign" lay-filter="basArmMastSign"></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/basArmMastSign/basArmMastSign.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="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="createTime" 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