From b36dbce34e28fadfe7080f28f0612b8239ca6cb5 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 09 九月 2025 16:38:06 +0800
Subject: [PATCH] *

---
 src/main/webapp/views/basArmMast/basArmMast.html                     |  188 ++++
 src/main/java/com/zy/asrs/entity/BasArmMast.java                     |  175 ++++
 src/main/java/com/zy/asrs/service/BasArmMastLogService.java          |    8 
 src/main/java/basArm.sql                                             |   18 
 src/main/resources/mapper/BasArmMapper.xml                           |   15 
 src/main/java/com/zy/asrs/mapper/BasArmMastLogMapper.java            |   12 
 src/main/java/com/zy/asrs/service/OpenService.java                   |    2 
 src/main/java/com/zy/asrs/controller/BasArmController.java           |  125 +++
 src/main/java/com/zy/asrs/service/impl/BasArmMastServiceImpl.java    |   12 
 src/main/webapp/static/js/basArm/basArm.js                           |  249 ++++++
 src/main/java/com/zy/asrs/entity/BasArm.java                         |   68 +
 src/main/java/com/zy/asrs/mapper/BasArmMapper.java                   |   12 
 src/main/java/com/zy/asrs/entity/param/TaskArmReportParam.java       |   26 
 src/main/java/com/zy/asrs/service/impl/BasArmServiceImpl.java        |   12 
 src/main/webapp/static/js/basArmMastLog/basArmMastLog.js             |  262 ++++++
 src/main/java/com/zy/asrs/controller/BasArmMastController.java       |  125 +++
 src/main/resources/mapper/BasArmMastLogMapper.xml                    |   28 
 src/main/webapp/views/basArm/basArm.html                             |  110 ++
 src/main/java/com/zy/asrs/controller/BasArmMastLogController.java    |  125 +++
 src/main/java/com/zy/asrs/controller/OpenController.java             |   34 
 src/main/resources/mapper/BasArmMastMapper.xml                       |   28 
 src/main/webapp/views/basArmMastLog/basArmMastLog.html               |  188 ++++
 src/main/java/com/zy/asrs/service/BasArmMastService.java             |    8 
 src/main/java/com/zy/asrs/mapper/BasArmMastMapper.java               |   12 
 src/main/java/com/zy/common/CodeBuilder.java                         |    2 
 src/main/java/com/zy/asrs/service/BasArmService.java                 |    8 
 src/main/java/com/zy/asrs/entity/BasArmMastLog.java                  |  160 ++++
 src/main/java/com/zy/asrs/service/impl/BasArmMastLogServiceImpl.java |   12 
 src/main/webapp/static/js/basArmMast/basArmMast.js                   |  262 ++++++
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java          |   19 
 src/main/resources/application.yml                                   |    3 
 31 files changed, 2,306 insertions(+), 2 deletions(-)

diff --git a/src/main/java/basArm.sql b/src/main/java/basArm.sql
new file mode 100644
index 0000000..f9501e5
--- /dev/null
+++ b/src/main/java/basArm.sql
@@ -0,0 +1,18 @@
+-- save basArm record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basArm/basArm.html', 'basArm绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basArm#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basArm#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basArm#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basArm#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basArm#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm/basArm.html', N'basArm绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basArm#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/java/com/zy/asrs/controller/BasArmController.java b/src/main/java/com/zy/asrs/controller/BasArmController.java
new file mode 100644
index 0000000..1714902
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasArmController.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.BasArm;
+import com.zy.asrs.service.BasArmService;
+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 BasArmController extends BaseController {
+
+    @Autowired
+    private BasArmService basArmService;
+
+    @RequestMapping(value = "/basArm/{id}/auth")
+    @ManagerAuth
+    public R get(@PathVariable("id") String id) {
+        return R.ok(basArmService.selectById(String.valueOf(id)));
+    }
+
+    @RequestMapping(value = "/basArm/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<BasArm> wrapper = new EntityWrapper<>();
+        excludeTrash(param);
+        convert(param, wrapper);
+        allLike(BasArm.class, param.keySet(), wrapper, condition);
+        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+        return R.ok(basArmService.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 = "/basArm/add/auth")
+    @ManagerAuth
+    public R add(BasArm basArm) {
+        basArmService.insert(basArm);
+        return R.ok();
+    }
+
+	@RequestMapping(value = "/basArm/update/auth")
+	@ManagerAuth
+    public R update(BasArm basArm){
+        if (Cools.isEmpty(basArm) || null==basArm.getId()){
+            return R.error();
+        }
+        basArmService.updateById(basArm);
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/basArm/delete/auth")
+    @ManagerAuth
+    public R delete(@RequestParam(value="ids[]") Long[] ids){
+         for (Long id : ids){
+            basArmService.deleteById(id);
+        }
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/basArm/export/auth")
+    @ManagerAuth
+    public R export(@RequestBody JSONObject param){
+        EntityWrapper<BasArm> wrapper = new EntityWrapper<>();
+        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+        Map<String, Object> map = excludeTrash(param.getJSONObject("basArm"));
+        convert(map, wrapper);
+        List<BasArm> list = basArmService.selectList(wrapper);
+        return R.ok(exportSupport(list, fields));
+    }
+
+    @RequestMapping(value = "/basArmQuery/auth")
+    @ManagerAuth
+    public R query(String condition) {
+        EntityWrapper<BasArm> wrapper = new EntityWrapper<>();
+        wrapper.like("id", condition);
+        Page<BasArm> page = basArmService.selectPage(new Page<>(0, 10), wrapper);
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (BasArm basArm : page.getRecords()){
+            Map<String, Object> map = new HashMap<>();
+            map.put("id", basArm.getId());
+            map.put("value", basArm.getId());
+            result.add(map);
+        }
+        return R.ok(result);
+    }
+
+    @RequestMapping(value = "/basArm/check/column/auth")
+    @ManagerAuth
+    public R query(@RequestBody JSONObject param) {
+        Wrapper<BasArm> wrapper = new EntityWrapper<BasArm>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+        if (null != basArmService.selectOne(wrapper)){
+            return R.parse(BaseRes.REPEAT).add(getComment(BasArm.class, String.valueOf(param.get("key"))));
+        }
+        return R.ok();
+    }
+
+}
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..9124c64
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasArmMastController.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.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.util.*;
+
+@RestController
+public class BasArmMastController extends BaseController {
+
+    @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();
+    }
+
+}
diff --git a/src/main/java/com/zy/asrs/controller/BasArmMastLogController.java b/src/main/java/com/zy/asrs/controller/BasArmMastLogController.java
new file mode 100644
index 0000000..e796aeb
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasArmMastLogController.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.BasArmMastLog;
+import com.zy.asrs.service.BasArmMastLogService;
+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 BasArmMastLogController extends BaseController {
+
+    @Autowired
+    private BasArmMastLogService basArmMastLogService;
+
+    @RequestMapping(value = "/basArmMastLog/{id}/auth")
+    @ManagerAuth
+    public R get(@PathVariable("id") String id) {
+        return R.ok(basArmMastLogService.selectById(String.valueOf(id)));
+    }
+
+    @RequestMapping(value = "/basArmMastLog/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<BasArmMastLog> wrapper = new EntityWrapper<>();
+        excludeTrash(param);
+        convert(param, wrapper);
+        allLike(BasArmMastLog.class, param.keySet(), wrapper, condition);
+        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+        return R.ok(basArmMastLogService.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 = "/basArmMastLog/add/auth")
+    @ManagerAuth
+    public R add(BasArmMastLog basArmMastLog) {
+        basArmMastLogService.insert(basArmMastLog);
+        return R.ok();
+    }
+
+	@RequestMapping(value = "/basArmMastLog/update/auth")
+	@ManagerAuth
+    public R update(BasArmMastLog basArmMastLog){
+        if (Cools.isEmpty(basArmMastLog) || null==basArmMastLog.getId()){
+            return R.error();
+        }
+        basArmMastLogService.updateById(basArmMastLog);
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/basArmMastLog/delete/auth")
+    @ManagerAuth
+    public R delete(@RequestParam(value="ids[]") Long[] ids){
+         for (Long id : ids){
+            basArmMastLogService.deleteById(id);
+        }
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/basArmMastLog/export/auth")
+    @ManagerAuth
+    public R export(@RequestBody JSONObject param){
+        EntityWrapper<BasArmMastLog> wrapper = new EntityWrapper<>();
+        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+        Map<String, Object> map = excludeTrash(param.getJSONObject("basArmMastLog"));
+        convert(map, wrapper);
+        List<BasArmMastLog> list = basArmMastLogService.selectList(wrapper);
+        return R.ok(exportSupport(list, fields));
+    }
+
+    @RequestMapping(value = "/basArmMastLogQuery/auth")
+    @ManagerAuth
+    public R query(String condition) {
+        EntityWrapper<BasArmMastLog> wrapper = new EntityWrapper<>();
+        wrapper.like("id", condition);
+        Page<BasArmMastLog> page = basArmMastLogService.selectPage(new Page<>(0, 10), wrapper);
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (BasArmMastLog basArmMastLog : page.getRecords()){
+            Map<String, Object> map = new HashMap<>();
+            map.put("id", basArmMastLog.getId());
+            map.put("value", basArmMastLog.getId());
+            result.add(map);
+        }
+        return R.ok(result);
+    }
+
+    @RequestMapping(value = "/basArmMastLog/check/column/auth")
+    @ManagerAuth
+    public R query(@RequestBody JSONObject param) {
+        Wrapper<BasArmMastLog> wrapper = new EntityWrapper<BasArmMastLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+        if (null != basArmMastLogService.selectOne(wrapper)){
+            return R.parse(BaseRes.REPEAT).add(getComment(BasArmMastLog.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 8b0604a..7ec497c 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -216,4 +216,38 @@
         System.out.println(JSON.toJSONString(param1));
     }
 
+
+    /**
+     * 鍒嗘嫞绾夸笂鎶ユ帴鏀�
+     */
+    @PostMapping("/arm/task/v1")
+    public synchronized R TaskArmReport(@RequestHeader(required = false) String appkey,
+                                           @RequestBody TaskArmReportParam param,
+                                           HttpServletRequest request) {
+        auth(appkey, param, request);
+        if (Cools.isEmpty(param)) {
+            return R.parse(BaseRes.PARAM);
+        }
+        if (Cools.isEmpty(param.getOrderNo())) {
+            return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
+        }
+        if (Cools.isEmpty(param.getSku())) {
+            return R.error("瀹汉鍨嬪彿[sku]涓嶈兘涓虹┖");
+        }
+        if (Cools.isEmpty(param.getPo())) {
+            return R.error("瀹汉PO[po]涓嶈兘涓虹┖");
+        }
+        if (Cools.isEmpty(param.getUpc())) {
+            return R.error("UPC[upc]涓嶈兘涓虹┖");
+        }
+        if (Cools.isEmpty(param.getSupplier())) {
+            return R.error("璐ф簮[supplier]涓嶈兘涓虹┖");
+        }
+        if (Cools.isEmpty(param.getStaNo())) {
+            return R.error("鍒嗘嫞鐐逛綅[staNo]涓嶈兘涓虹┖");
+        }
+        openService.taskArmReport(param);
+        return R.ok();
+    }
+
 }
diff --git a/src/main/java/com/zy/asrs/entity/BasArm.java b/src/main/java/com/zy/asrs/entity/BasArm.java
new file mode 100644
index 0000000..cc5c0e3
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasArm.java
@@ -0,0 +1,68 @@
+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")
+public class BasArm 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= "鐮佸灈浣�")
+    @TableId(value = "sta_no", type = IdType.INPUT)
+    @TableField("sta_no")
+    private Integer staNo;
+
+    /**
+     * 鎷嗗灈浣�
+     */
+    @ApiModelProperty(value= "鎷嗗灈浣�")
+    @TableId(value = "sorting_line", type = IdType.INPUT)
+    @TableField("sorting_line")
+    private Integer sortingLine;
+
+    @ApiModelProperty(value= "")
+    private Integer status;
+
+    public BasArm() {}
+
+    public BasArm(Integer armNo,Integer staNo,Integer sortingLine,Integer status) {
+        this.armNo = armNo;
+        this.staNo = staNo;
+        this.sortingLine = sortingLine;
+        this.status = status;
+    }
+
+//    BasArm basArm = new BasArm(
+//            null,    // 鏈烘鑷傜紪鍙穂闈炵┖]
+//            null,    // 鐮佸灈浣峓闈炵┖]
+//            null,    // 鎷嗗灈浣峓闈炵┖]
+//            null    // [闈炵┖]
+//    );
+
+
+}
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..46b0e92
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasArmMast.java
@@ -0,0 +1,175 @@
+package com.zy.asrs.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableField;
+
+import com.zy.asrs.entity.param.TaskArmReportParam;
+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(TaskArmReportParam param) {
+        this.orderNo = param.getOrderNo();
+        this.sku = param.getSku();
+        this.po = param.getPo();
+        this.upc = param.getUpc();
+        this.supplier = param.getSupplier();
+        this.createTime = param.getCreateTime();
+        this.sortingLine = Integer.getInteger(param.getStaNo());
+    }
+
+    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/BasArmMastLog.java b/src/main/java/com/zy/asrs/entity/BasArmMastLog.java
new file mode 100644
index 0000000..ad60b39
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasArmMastLog.java
@@ -0,0 +1,160 @@
+package com.zy.asrs.entity;
+
+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_arm_mast_log")
+public class BasArmMastLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ApiModelProperty(value= "ID")
+    private Long id;
+
+    /**
+     * 鏈烘鑷傜紪鍙�
+     */
+    @ApiModelProperty(value= "鏈烘鑷傜紪鍙�")
+    @TableField("arm_no")
+    private Integer armNo;
+
+    /**
+     * 鎿嶄綔鏂瑰悜
+     */
+    @ApiModelProperty(value= "鎿嶄綔鏂瑰悜")
+    @TableField("arm_direction")
+    private Integer armDirection;
+
+    /**
+     * 缁堢偣
+     */
+    @ApiModelProperty(value= "缁堢偣")
+    @TableField("sta_no")
+    private Integer staNo;
+
+    /**
+     * 璧风偣
+     */
+    @ApiModelProperty(value= "璧风偣")
+    @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= "鏃堕棿鎴�")
+    private Long createTime;
+
+    /**
+     * 寮傚父浠ｇ爜
+     */
+    @ApiModelProperty(value= "寮傚父浠ｇ爜")
+    @TableField("arm_error")
+    private Long armError;
+
+    /**
+     * 寮傚父淇℃伅
+     */
+    @ApiModelProperty(value= "寮傚父淇℃伅")
+    @TableField("arm_msg")
+    private String armMsg;
+
+    public BasArmMastLog() {}
+
+    public BasArmMastLog(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;
+    }
+
+//    BasArmMastLog basArmMastLog = new BasArmMastLog(
+//            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/param/TaskArmReportParam.java b/src/main/java/com/zy/asrs/entity/param/TaskArmReportParam.java
new file mode 100644
index 0000000..c7aba57
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/TaskArmReportParam.java
@@ -0,0 +1,26 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+/*
+ *  Created by Monkey D. Luffy on 2025.09.09
+ * */
+@Data
+public class TaskArmReportParam {
+    //鍗曟嵁缂栧彿
+    private String orderNo;
+    //瀹汉鍨嬪彿
+    private String sku;
+    //瀹汉PO
+    private String po;
+    //鏉＄爜鍊�
+    private String upc;
+    //璐ф簮
+    private String supplier;
+    //鍒嗘嫞鐐逛綅锛堥渶鍒嗘嫞绾胯ˉ鍏咃級
+    private String staNo;
+    //绠辨暟
+    private Double ctns = 1.0;
+    //鏃堕棿鎴�
+    private Long createTime;
+}
diff --git a/src/main/java/com/zy/asrs/mapper/BasArmMapper.java b/src/main/java/com/zy/asrs/mapper/BasArmMapper.java
new file mode 100644
index 0000000..97023e8
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasArmMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.BasArm;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasArmMapper extends BaseMapper<BasArm> {
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/BasArmMastLogMapper.java b/src/main/java/com/zy/asrs/mapper/BasArmMastLogMapper.java
new file mode 100644
index 0000000..bd46447
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasArmMastLogMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.BasArmMastLog;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasArmMastLogMapper extends BaseMapper<BasArmMastLog> {
+
+}
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/service/BasArmMastLogService.java b/src/main/java/com/zy/asrs/service/BasArmMastLogService.java
new file mode 100644
index 0000000..a8dbff9
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasArmMastLogService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.BasArmMastLog;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface BasArmMastLogService extends IService<BasArmMastLog> {
+
+}
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/BasArmService.java b/src/main/java/com/zy/asrs/service/BasArmService.java
new file mode 100644
index 0000000..d83005d
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasArmService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.BasArm;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface BasArmService extends IService<BasArm> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index afd90b1..26d56b9 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -43,4 +43,6 @@
      * @param param
      */
     void syncMat(MatSyncParam param);
+
+    void taskArmReport(TaskArmReportParam param);
 }
diff --git a/src/main/java/com/zy/asrs/service/impl/BasArmMastLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasArmMastLogServiceImpl.java
new file mode 100644
index 0000000..733091a
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasArmMastLogServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.BasArmMastLogMapper;
+import com.zy.asrs.entity.BasArmMastLog;
+import com.zy.asrs.service.BasArmMastLogService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("basArmMastLogService")
+public class BasArmMastLogServiceImpl extends ServiceImpl<BasArmMastLogMapper, BasArmMastLog> implements BasArmMastLogService {
+
+}
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/BasArmServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasArmServiceImpl.java
new file mode 100644
index 0000000..39f8a40
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasArmServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.BasArmMapper;
+import com.zy.asrs.entity.BasArm;
+import com.zy.asrs.service.BasArmService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("basArmService")
+public class BasArmServiceImpl extends ServiceImpl<BasArmMapper, BasArm> implements BasArmService {
+
+}
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 29dfc78..4df751c 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -49,6 +49,10 @@
     private TagService tagService;
     @Autowired
     private TagMapper tagMapper;
+    @Autowired
+    private BasArmService basArmService;
+    @Autowired
+    private BasArmMastService basArmMastService;
 
     @Override
     @Transactional
@@ -589,4 +593,19 @@
 
     }
 
+    @Override
+    @Transactional
+    public void taskArmReport(TaskArmReportParam param) {
+        BasArmMast basArmMast = new BasArmMast(param);
+        List<BasArm> basArmList = basArmService.selectList(new EntityWrapper<BasArm>().eq("sorting_line", basArmMast.getStaNo()));
+        for (BasArm basArm : basArmList) {
+            if (basArm.getStatus()!=1){
+                continue;
+            }
+            basArmMast.setArmNo(basArm.getArmNo());
+            basArmMast.setStaNo(basArm.getStaNo());
+        }
+        basArmMastService.insert(basArmMast);
+    }
+
 }
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index 7edae45..8998eb4 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="192.168.4.191:50948;databasename=jshdasrs";
         generator.username="sa";
         generator.password="sa@123";
-        generator.table="asr_bas_arm_rules";
+        generator.table="asr_bas_arm";
         generator.packagePath="com.zy.asrs";
         generator.build();
     }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0260cac..37415cc 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,8 +10,9 @@
     enabled: false
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://127.0.0.1:1433;databasename=jshdasrs
+#    url: jdbc:sqlserver://127.0.0.1:1433;databasename=jshdasrs
 #    url: jdbc:sqlserver://10.10.10.235:1433;databasename=jshdasrs
+    url: jdbc:sqlserver://192.168.4.191:50948;databasename=jshdasrs
     username: sa
     password: sa@123
   mvc:
diff --git a/src/main/resources/mapper/BasArmMapper.xml b/src/main/resources/mapper/BasArmMapper.xml
new file mode 100644
index 0000000..5b54298
--- /dev/null
+++ b/src/main/resources/mapper/BasArmMapper.xml
@@ -0,0 +1,15 @@
+<?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.BasArmMapper">
+
+    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasArm">
+        <id column="id" property="id" />
+        <result column="arm_no" property="armNo" />
+        <result column="sta_no" property="staNo" />
+        <result column="sorting_line" property="sortingLine" />
+        <result column="status" property="status" />
+
+    </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/BasArmMastLogMapper.xml b/src/main/resources/mapper/BasArmMastLogMapper.xml
new file mode 100644
index 0000000..8d3420e
--- /dev/null
+++ b/src/main/resources/mapper/BasArmMastLogMapper.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.BasArmMastLogMapper">
+
+    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasArmMastLog">
+        <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/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/webapp/static/js/basArm/basArm.js b/src/main/webapp/static/js/basArm/basArm.js
new file mode 100644
index 0000000..43065e2
--- /dev/null
+++ b/src/main/webapp/static/js/basArm/basArm.js
@@ -0,0 +1,249 @@
+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: '#basArm',
+        headers: {token: localStorage.getItem('token')},
+        url: baseUrl+'/basArm/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: 'staNo', align: 'center',title: '鐮佸灈浣�'}
+            ,{field: 'sortingLine', align: 'center',title: '鎷嗗灈浣�'}
+            ,{field: 'status', align: 'center',title: ''}
+
+            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+        ]],
+        request: {
+            pageName: 'curr',
+            pageSize: 'limit'
+        },
+        parseData: function (res) {
+            return {
+                'code': res.code,
+                'msg': res.msg,
+                'count': res.data.total,
+                'data': res.data.records
+            }
+        },
+        response: {
+            statusCode: 200
+        },
+        done: function(res, curr, count) {
+            if (res.code === 403) {
+                top.location.href = baseUrl+"/";
+            }
+            pageCurr=curr;
+            limit();
+        }
+    });
+
+    // 鐩戝惉鎺掑簭浜嬩欢
+    table.on('sort(basArm)', 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(basArm)', 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 = {
+                        'basArm': exportData,
+                        'fields': fields
+                    };
+                    $.ajax({
+                        url: baseUrl+"/basArm/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(basArm)', 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+"/basArm/"+(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+"/basArm/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/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/basArmMastLog/basArmMastLog.js b/src/main/webapp/static/js/basArmMastLog/basArmMastLog.js
new file mode 100644
index 0000000..4daff55
--- /dev/null
+++ b/src/main/webapp/static/js/basArmMastLog/basArmMastLog.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: '#basArmMastLog',
+        headers: {token: localStorage.getItem('token')},
+        url: baseUrl+'/basArmMastLog/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(basArmMastLog)', 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(basArmMastLog)', 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 = {
+                        'basArmMastLog': exportData,
+                        'fields': fields
+                    };
+                    $.ajax({
+                        url: baseUrl+"/basArmMastLog/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(basArmMastLog)', 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+"/basArmMastLog/"+(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+"/basArmMastLog/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/basArm/basArm.html b/src/main/webapp/views/basArm/basArm.html
new file mode 100644
index 0000000..476bc16
--- /dev/null
+++ b/src/main/webapp/views/basArm/basArm.html
@@ -0,0 +1,110 @@
+<!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">&emsp;
+                        <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+                            <i class="layui-icon">&#xe615;</i>鎼滅储
+                        </button>
+                        <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+                            <i class="layui-icon">&#xe666;</i>閲嶇疆
+                        </button>
+                    </div>
+                </div>
+            </div>
+            <table class="layui-hide" id="basArm" lay-filter="basArm"></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/basArm/basArm.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="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="status" 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>
+
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">&emsp;
+                        <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+                            <i class="layui-icon">&#xe615;</i>鎼滅储
+                        </button>
+                        <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+                            <i class="layui-icon">&#xe666;</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/basArmMastLog/basArmMastLog.html b/src/main/webapp/views/basArmMastLog/basArmMastLog.html
new file mode 100644
index 0000000..bcd5efc
--- /dev/null
+++ b/src/main/webapp/views/basArmMastLog/basArmMastLog.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">&emsp;
+                        <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+                            <i class="layui-icon">&#xe615;</i>鎼滅储
+                        </button>
+                        <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+                            <i class="layui-icon">&#xe666;</i>閲嶇疆
+                        </button>
+                    </div>
+                </div>
+            </div>
+            <table class="layui-hide" id="basArmMastLog" lay-filter="basArmMastLog"></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/basArmMastLog/basArmMastLog.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>
+

--
Gitblit v1.9.1