From a8ab74fdbc4e590a4c9778d447538c3bc30925e4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 24 八月 2020 08:54:44 +0800
Subject: [PATCH] Merge branches 'gdasrs' and 'jsasrs' of http://192.168.2.250:9527/r/zy-asrs into gdasrs

---
 src/main/java/com/zy/asrs/utils/VersionUtils.java                  |   10 
 src/main/java/com/zy/common/properties/SystemProperties.java       |    2 
 src/main/java/basPlcerror.sql                                      |   18 
 src/main/java/com/zy/asrs/service/BasPlcerrorService.java          |    8 
 src/main/java/com/zy/asrs/controller/WorkController.java           |   22 
 src/main/java/com/zy/asrs/controller/WaitPakinController.java      |    6 
 src/main/java/com/zy/asrs/task/handler/NotifyLogHandler.java       |    4 
 src/main/java/com/zy/asrs/controller/WaitPakinLogController.java   |    8 
 src/main/webapp/views/pda/stockOut.html                            |    2 
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java      |   27 
 src/main/resources/mapper/BasPlcerrorMapper.xml                    |   16 
 src/main/java/com/zy/asrs/service/impl/BasPlcerrorServiceImpl.java |   12 
 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java        |    6 
 src/main/resources/mapper/WaitPakinMapper.xml                      |   14 
 src/main/java/com/zy/asrs/controller/BasPlcerrorController.java    |  133 ++++
 src/main/java/com/zy/asrs/entity/BasPlcerror.java                  |  165 ++++++
 src/main/resources/mapper/WaitPakinLogMapper.xml                   |   16 
 src/main/java/com/zy/common/model/enums/SysOsType.java             |    2 
 src/main/webapp/views/basPlcerror/basPlcerror_detail.html          |   96 +++
 src/main/java/com/zy/common/CodeBuilder.java                       |    4 
 src/main/java/com/zy/asrs/entity/WaitPakinLog.java                 |  243 ++------
 src/main/java/com/zy/asrs/mapper/BasPlcerrorMapper.java            |   12 
 src/main/java/com/zy/asrs/entity/WaitPakin.java                    |  227 ++------
 src/main/webapp/static/js/waitPakin/waitPakin.js                   |   43 
 src/main/webapp/static/js/basPlcerror/basPlcerror.js               |  369 +++++++++++++
 src/main/webapp/views/pakStore/stockOut.html                       |    2 
 src/main/webapp/views/basPlcerror/basPlcerror.html                 |   56 ++
 src/main/webapp/static/js/waitPakinLog/waitPakinLog.js             |   40 
 28 files changed, 1,133 insertions(+), 430 deletions(-)

diff --git a/src/main/java/basPlcerror.sql b/src/main/java/basPlcerror.sql
new file mode 100644
index 0000000..370c224
--- /dev/null
+++ b/src/main/java/basPlcerror.sql
@@ -0,0 +1,18 @@
+-- save basPlcerror record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basPlcerror/basPlcerror.html', 'basPlcerror绠$悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basPlcerror#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basPlcerror#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basPlcerror#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basPlcerror#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basPlcerror#btn-export', '瀵煎嚭', '', '3', '4', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basPlcerror#btn-into', '瀵煎叆', '', '3', '5', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basPlcerror/basPlcerror.html', N'plc寮傚父绠$悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basPlcerror#view', N'鏌ヨ', '20361', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basPlcerror#btn-add', N'鏂板', '20361', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basPlcerror#btn-edit', N'缂栬緫', '20361', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basPlcerror#btn-delete', N'鍒犻櫎', '20361', '3', '3', '1');
diff --git a/src/main/java/com/zy/asrs/controller/BasPlcerrorController.java b/src/main/java/com/zy/asrs/controller/BasPlcerrorController.java
new file mode 100644
index 0000000..5e81cc1
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasPlcerrorController.java
@@ -0,0 +1,133 @@
+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.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.core.common.R;
+import com.zy.asrs.entity.BasPlcerror;
+import com.zy.asrs.service.BasPlcerrorService;
+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 BasPlcerrorController extends BaseController {
+
+    @Autowired
+    private BasPlcerrorService basPlcerrorService;
+
+    @RequestMapping(value = "/basPlcerror/{id}/auth")
+    @ManagerAuth
+    public R get(@PathVariable("id") String id) {
+        return R.ok(basPlcerrorService.selectById(String.valueOf(id)));
+    }
+
+    @RequestMapping(value = "/basPlcerror/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 Map<String, Object> param){
+        EntityWrapper<BasPlcerror> wrapper = new EntityWrapper<>();
+        excludeTrash(param);
+        convert(param, wrapper);
+        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+        return R.ok(basPlcerrorService.selectPage(new Page<>(curr, limit), wrapper));
+    }
+
+    private void convert(Map<String, Object> map, EntityWrapper 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 = "/basPlcerror/add/auth")
+    @ManagerAuth
+    public R add(BasPlcerror basPlcerror) {
+        basPlcerror.setModiUser(getUserId());
+        basPlcerror.setModiTime(new Date());
+        basPlcerror.setAppeUser(getUserId());
+        basPlcerror.setAppeTime(new Date());
+        basPlcerrorService.insert(basPlcerror);
+        return R.ok();
+    }
+
+	@RequestMapping(value = "/basPlcerror/update/auth")
+	@ManagerAuth
+    public R update(BasPlcerror basPlcerror){
+        if (Cools.isEmpty(basPlcerror) || null==basPlcerror.getErrorCode()){
+            return R.error();
+        }
+        basPlcerror.setModiUser(getUserId());
+        basPlcerror.setModiTime(new Date());
+        basPlcerrorService.updateById(basPlcerror);
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/basPlcerror/delete/auth")
+    @ManagerAuth
+    public R delete(@RequestParam String param){
+        List<BasPlcerror> list = JSONArray.parseArray(param, BasPlcerror.class);
+        if (Cools.isEmpty(list)){
+            return R.error();
+        }
+        for (BasPlcerror entity : list){
+            basPlcerrorService.delete(new EntityWrapper<>(entity));
+        }
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/basPlcerror/export/auth")
+    @ManagerAuth
+    public R export(@RequestBody JSONObject param){
+        EntityWrapper<BasPlcerror> wrapper = new EntityWrapper<>();
+        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+        Map<String, Object> map = excludeTrash(param.getJSONObject("basPlcerror"));
+        convert(map, wrapper);
+        List<BasPlcerror> list = basPlcerrorService.selectList(wrapper);
+        return R.ok(exportSupport(list, fields));
+    }
+
+    @RequestMapping(value = "/basPlcerrorQuery/auth")
+    @ManagerAuth
+    public R query(String condition) {
+        EntityWrapper<BasPlcerror> wrapper = new EntityWrapper<>();
+        wrapper.like("error_desc", condition);
+        Page<BasPlcerror> page = basPlcerrorService.selectPage(new Page<>(0, 10), wrapper);
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (BasPlcerror basPlcerror : page.getRecords()){
+            Map<String, Object> map = new HashMap<>();
+            map.put("id", basPlcerror.getErrorCode());
+            map.put("value", basPlcerror.getErrorDesc());
+            result.add(map);
+        }
+        return R.ok(result);
+    }
+
+    @RequestMapping(value = "/basPlcerror/check/column/auth")
+    @ManagerAuth
+    public R query(@RequestBody JSONObject param) {
+        Wrapper<BasPlcerror> wrapper = new EntityWrapper<BasPlcerror>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+        if (null != basPlcerrorService.selectOne(wrapper)){
+            return R.parse(BaseRes.REPEAT).add(getComment(BasPlcerror.class, String.valueOf(param.get("key"))));
+        }
+        return R.ok();
+    }
+
+}
diff --git a/src/main/java/com/zy/asrs/controller/WaitPakinController.java b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
index 2db6de1..9898dde 100644
--- a/src/main/java/com/zy/asrs/controller/WaitPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
@@ -73,7 +73,7 @@
 	@RequestMapping(value = "/waitPakin/update/auth")
 	@ManagerAuth
     public R update(WaitPakin waitPakin){
-        if (Cools.isEmpty(waitPakin) || null==waitPakin.getId()){
+        if (Cools.isEmpty(waitPakin)){
             return R.error();
         }
         waitPakinService.updateById(waitPakin);
@@ -113,8 +113,8 @@
         List<Map<String, Object>> result = new ArrayList<>();
         for (WaitPakin waitPakin : page.getRecords()){
             Map<String, Object> map = new HashMap<>();
-            map.put("id", waitPakin.getId());
-            map.put("value", waitPakin.getId());
+            map.put("id", waitPakin.getZpallet());
+            map.put("value", waitPakin.getZpallet());
             result.add(map);
         }
         return R.ok(result);
diff --git a/src/main/java/com/zy/asrs/controller/WaitPakinLogController.java b/src/main/java/com/zy/asrs/controller/WaitPakinLogController.java
index ab32674..d0d8bc2 100644
--- a/src/main/java/com/zy/asrs/controller/WaitPakinLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WaitPakinLogController.java
@@ -45,7 +45,7 @@
         convert(param, wrapper);
         if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
         else {
-            wrapper.orderBy("id", false);
+            wrapper.orderBy("modi_time", false);
         }
         return R.ok(waitPakinLogService.selectPage(new Page<>(curr, limit), wrapper));
     }
@@ -73,7 +73,7 @@
 	@RequestMapping(value = "/waitPakinLog/update/auth")
 	@ManagerAuth
     public R update(WaitPakinLog waitPakinLog){
-        if (Cools.isEmpty(waitPakinLog) || null==waitPakinLog.getId()){
+        if (Cools.isEmpty(waitPakinLog)){
             return R.error();
         }
         waitPakinLogService.updateById(waitPakinLog);
@@ -113,8 +113,8 @@
         List<Map<String, Object>> result = new ArrayList<>();
         for (WaitPakinLog waitPakinLog : page.getRecords()){
             Map<String, Object> map = new HashMap<>();
-            map.put("id", waitPakinLog.getId());
-            map.put("value", waitPakinLog.getId());
+            map.put("id", waitPakinLog.getZpallet());
+            map.put("value", waitPakinLog.getZpallet());
             result.add(map);
         }
         return R.ok(result);
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 70f9050..6627272 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -15,6 +15,11 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * 宸ヤ綔娴佹帴鍙f帶鍒跺櫒
  * Created by vincent on 2020/6/10
@@ -42,7 +47,22 @@
     @RequestMapping("/available/take/site")
     @ManagerAuth(memo = "鑾峰彇鍑哄簱绔欑偣")
     public R availableTakeSite(){
-        return R.ok().add(basDevpService.getAvailableOutSite(101));
+        List<Map<String, Object>> result = new ArrayList<>();
+        List<Integer> outSite = basDevpService.getAvailableOutSite(101);
+        for (Integer siteId : outSite) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("siteId", siteId);
+            map.put("desc", siteId + "锛堝叏鏉垮嚭搴撳彛锛�");
+            result.add(map);
+        }
+        List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
+        for (Integer siteId : pickOutSite) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("siteId", siteId);
+            map.put("desc", siteId + "锛堟嫞鏂欏嚭搴撳彛锛�");
+            result.add(map);
+        }
+        return R.ok().add(result);
     }
 
     @RequestMapping("/available/take/check/site")
diff --git a/src/main/java/com/zy/asrs/entity/BasPlcerror.java b/src/main/java/com/zy/asrs/entity/BasPlcerror.java
new file mode 100644
index 0000000..4138cbc
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasPlcerror.java
@@ -0,0 +1,165 @@
+package com.zy.asrs.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@TableName("asr_bas_plcerror")
+public class BasPlcerror implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 寮傚父缂栧彿
+     */
+    @ApiModelProperty(value= "寮傚父缂栧彿")
+    @TableId(value = "error_code", type = IdType.INPUT)
+    @TableField("error_code")
+    private Integer errorCode;
+
+    /**
+     * 寮傚父鎻忚堪
+     */
+    @ApiModelProperty(value= "寮傚父鎻忚堪")
+    @TableField("error_desc")
+    private String errorDesc;
+
+    /**
+     * 淇敼鏃堕棿
+     */
+    @ApiModelProperty(value= "淇敼鏃堕棿")
+    @TableField("modi_time")
+    private Date modiTime;
+
+    /**
+     * 淇敼浜哄憳
+     */
+    @ApiModelProperty(value= "淇敼浜哄憳")
+    @TableField("modi_user")
+    private Long modiUser;
+
+    /**
+     * 娣诲姞鏃堕棿
+     */
+    @ApiModelProperty(value= "娣诲姞鏃堕棿")
+    @TableField("appe_time")
+    private Date appeTime;
+
+    /**
+     * 鍒涘缓鑰�
+     */
+    @ApiModelProperty(value= "鍒涘缓鑰�")
+    @TableField("appe_user")
+    private Long appeUser;
+
+    public BasPlcerror() {}
+
+    public BasPlcerror(Integer errorCode,String errorDesc,Date modiTime,Long modiUser,Date appeTime,Long appeUser) {
+        this.errorDesc = errorDesc;
+        this.modiTime = modiTime;
+        this.modiUser = modiUser;
+        this.appeTime = appeTime;
+        this.appeUser = appeUser;
+    }
+
+//    BasPlcerror basPlcerror = new BasPlcerror(
+//            null,    // 寮傚父缂栧彿[闈炵┖]
+//            null,    // 寮傚父鎻忚堪
+//            null,    // 淇敼鏃堕棿
+//            null,    // 淇敼浜哄憳
+//            null,    // 娣诲姞鏃堕棿
+//            null    // 鍒涘缓鑰�
+//    );
+
+    public Integer getErrorCode() {
+        return errorCode;
+    }
+
+    public void setErrorCode(Integer errorCode) {
+        this.errorCode = errorCode;
+    }
+
+    public String getErrorDesc() {
+        return errorDesc;
+    }
+
+    public void setErrorDesc(String errorDesc) {
+        this.errorDesc = errorDesc;
+    }
+
+    public Date getModiTime() {
+        return modiTime;
+    }
+
+    public String getModiTime$(){
+        if (Cools.isEmpty(this.modiTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
+    }
+
+    public void setModiTime(Date modiTime) {
+        this.modiTime = modiTime;
+    }
+
+    public Long getModiUser() {
+        return modiUser;
+    }
+
+    public String getModiUser$(){
+        UserService service = SpringUtils.getBean(UserService.class);
+        User user = service.selectById(this.modiUser);
+        if (!Cools.isEmpty(user)){
+            return String.valueOf(user.getUsername());
+        }
+        return null;
+    }
+
+    public void setModiUser(Long modiUser) {
+        this.modiUser = modiUser;
+    }
+
+    public Date getAppeTime() {
+        return appeTime;
+    }
+
+    public String getAppeTime$(){
+        if (Cools.isEmpty(this.appeTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
+    }
+
+    public void setAppeTime(Date appeTime) {
+        this.appeTime = appeTime;
+    }
+
+    public Long getAppeUser() {
+        return appeUser;
+    }
+
+    public String getAppeUser$(){
+        UserService service = SpringUtils.getBean(UserService.class);
+        User user = service.selectById(this.appeUser);
+        if (!Cools.isEmpty(user)){
+            return String.valueOf(user.getUsername());
+        }
+        return null;
+    }
+
+    public void setAppeUser(Long appeUser) {
+        this.appeUser = appeUser;
+    }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index c55f1a6..e93fc7e 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -1,41 +1,25 @@
 package com.zy.asrs.entity;
 
 import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
 import com.core.common.Cools;
-import com.core.common.SpringUtils;
-import com.zy.system.entity.User;
-import com.zy.system.service.UserService;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+@Data
 @TableName("cust_wait_pakin")
 public class WaitPakin implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     /**
-     * 缂栧彿
+     * 鐗╂枡
      */
-    @ApiModelProperty(value= "缂栧彿")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 鎵樼洏鐮�
-     */
-    @ApiModelProperty(value= "鎵樼洏鐮�")
-    private String barcode;
-
-    /**
-     * 鐗╂枡缂栫爜
-     */
-    @ApiModelProperty(value= "鐗╂枡缂栫爜")
+    @ApiModelProperty(value= "鐗╂枡")
     private String matnr;
 
     /**
@@ -43,6 +27,43 @@
      */
     @ApiModelProperty(value= "鐗╂枡鎻忚堪")
     private String maktx;
+
+
+    /**
+     * 浠撳簱鍙�
+     */
+    @ApiModelProperty(value= "瑙勬牸")
+    private String lgnum;
+
+    /**
+     * 浠撳簱鍙�
+     */
+    @ApiModelProperty(value= "鐗╂枡绫诲埆")
+    private String type;
+
+    /**
+     * 浠撳簱鍙�
+     */
+    @ApiModelProperty(value= "棰滆壊")
+    private String color;
+
+    /**
+     * 浠撳簱鍙�
+     */
+    @ApiModelProperty(value= "渚涘簲鍟�")
+    private String supplier;
+
+    /**
+     * 浠撳簱鍙�
+     */
+    @ApiModelProperty(value= "浠撳簱")
+    private String warehouse;
+
+    /**
+     * 浠撳簱鍙�
+     */
+    @ApiModelProperty(value= "鍝佺墝")
+    private String brand;
 
     /**
      * 鏁伴噺
@@ -54,13 +75,30 @@
      * 鍗曚綅
      */
     @ApiModelProperty(value= "鍗曚綅")
-    private String unit;
+    private String altme;
 
     /**
-     * 鐘舵��
+     * 鎵樼洏鏉$爜
      */
+    @ApiModelProperty(value= "鎵樼洏鏉$爜")
+    private String zpallet;
+
+    /**
+     * 鐢ㄦ埛ID
+     */
+    @ApiModelProperty(value= "鐢ㄦ埛ID")
+    private String bname;
+
+    @ApiModelProperty(value= "搴撲綅鍙�")
+    @TableField("loc_no")
+    private Date locNo;
+
     @ApiModelProperty(value= "鐘舵��")
     private String status;
+
+    @ApiModelProperty(value= "鍏ュ嚭鐘舵��")
+    @TableField("io_status")
+    private String ioStatus;
 
     /**
      * 澶囨敞
@@ -96,134 +134,11 @@
     @TableField("appe_user")
     private Long appeUser;
 
-    public WaitPakin() {}
-
-    public WaitPakin(String barcode,String matnr,String maktx,Double anfme,String unit,String status,String memo,Date modiTime,Long modiUser,Date appeTime,Long appeUser) {
-        this.barcode = barcode;
-        this.matnr = matnr;
-        this.maktx = maktx;
-        this.anfme = anfme;
-        this.unit = unit;
-        this.status = status;
-        this.memo = memo;
-        this.modiTime = modiTime;
-        this.modiUser = modiUser;
-        this.appeTime = appeTime;
-        this.appeUser = appeUser;
-    }
-
-//    WaitPakin waitPakin = new WaitPakin(
-//            null,    // 鎵樼洏鐮�
-//            null,    // 鐗╂枡缂栫爜
-//            null,    // 鐗╂枡鎻忚堪
-//            null,    // 鏁伴噺
-//            null,    // 鍗曚綅
-//            null,    // 鐘舵��
-//            null,    // 澶囨敞
-//            null,    // 淇敼鏃堕棿
-//            null,    // 淇敼浜哄憳
-//            null,    // 娣诲姞鏃堕棿
-//            null    // 鍒涘缓鑰�
-//    );
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getBarcode() {
-        return barcode;
-    }
-
-    public void setBarcode(String barcode) {
-        this.barcode = barcode;
-    }
-
-    public String getMatnr() {
-        return matnr;
-    }
-
-    public void setMatnr(String matnr) {
-        this.matnr = matnr;
-    }
-
-    public String getMaktx() {
-        return maktx;
-    }
-
-    public void setMaktx(String maktx) {
-        this.maktx = maktx;
-    }
-
-    public Double getAnfme() {
-        return anfme;
-    }
-
-    public void setAnfme(Double anfme) {
-        this.anfme = anfme;
-    }
-
-    public String getUnit() {
-        return unit;
-    }
-
-    public void setUnit(String unit) {
-        this.unit = unit;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public Date getModiTime() {
-        return modiTime;
-    }
-
     public String getModiTime$(){
         if (Cools.isEmpty(this.modiTime)){
             return "";
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
-    }
-
-    public void setModiTime(Date modiTime) {
-        this.modiTime = modiTime;
-    }
-
-    public Long getModiUser() {
-        return modiUser;
-    }
-
-    public String getModiUser$(){
-        UserService service = SpringUtils.getBean(UserService.class);
-        User user = service.selectById(this.modiUser);
-        if (!Cools.isEmpty(user)){
-            return String.valueOf(user.getUsername());
-        }
-        return null;
-    }
-
-    public void setModiUser(Long modiUser) {
-        this.modiUser = modiUser;
-    }
-
-    public Date getAppeTime() {
-        return appeTime;
     }
 
     public String getAppeTime$(){
@@ -232,27 +147,5 @@
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
     }
-
-    public void setAppeTime(Date appeTime) {
-        this.appeTime = appeTime;
-    }
-
-    public Long getAppeUser() {
-        return appeUser;
-    }
-
-    public String getAppeUser$(){
-        UserService service = SpringUtils.getBean(UserService.class);
-        User user = service.selectById(this.appeUser);
-        if (!Cools.isEmpty(user)){
-            return String.valueOf(user.getUsername());
-        }
-        return null;
-    }
-
-    public void setAppeUser(Long appeUser) {
-        this.appeUser = appeUser;
-    }
-
 
 }
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
index 48c70f6..8f7a8c2 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -1,48 +1,26 @@
 package com.zy.asrs.entity;
 
 import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
 import com.core.common.Cools;
-import com.core.common.SpringUtils;
-import com.zy.system.entity.User;
-import com.zy.system.service.UserService;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+@Data
 @TableName("cust_wait_pakin_log")
 public class WaitPakinLog implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 缂栧彿
-     */
-    @ApiModelProperty(value= "缂栧彿")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
 
     /**
-     * 鍏ュ簱閫氱煡鍙�
+     * 鐗╂枡
      */
-    @ApiModelProperty(value= "鍏ュ簱閫氱煡鍙�")
-    @TableField("pakin_id")
-    private Long pakinId;
-
-    /**
-     * 鎵樼洏鐮�
-     */
-    @ApiModelProperty(value= "鎵樼洏鐮�")
-    private String barcode;
-
-    /**
-     * 鐗╂枡缂栫爜
-     */
-    @ApiModelProperty(value= "鐗╂枡缂栫爜")
+    @ApiModelProperty(value= "鐗╂枡")
     private String matnr;
 
     /**
@@ -50,6 +28,43 @@
      */
     @ApiModelProperty(value= "鐗╂枡鎻忚堪")
     private String maktx;
+
+
+    /**
+     * 浠撳簱鍙�
+     */
+    @ApiModelProperty(value= "瑙勬牸")
+    private String lgnum;
+
+    /**
+     * 浠撳簱鍙�
+     */
+    @ApiModelProperty(value= "鐗╂枡绫诲埆")
+    private String type;
+
+    /**
+     * 浠撳簱鍙�
+     */
+    @ApiModelProperty(value= "棰滆壊")
+    private String color;
+
+    /**
+     * 浠撳簱鍙�
+     */
+    @ApiModelProperty(value= "渚涘簲鍟�")
+    private String supplier;
+
+    /**
+     * 浠撳簱鍙�
+     */
+    @ApiModelProperty(value= "浠撳簱")
+    private String warehouse;
+
+    /**
+     * 浠撳簱鍙�
+     */
+    @ApiModelProperty(value= "鍝佺墝")
+    private String brand;
 
     /**
      * 鏁伴噺
@@ -61,13 +76,30 @@
      * 鍗曚綅
      */
     @ApiModelProperty(value= "鍗曚綅")
-    private String unit;
+    private String altme;
 
     /**
-     * 鐘舵��
+     * 鎵樼洏鏉$爜
      */
+    @ApiModelProperty(value= "鎵樼洏鏉$爜")
+    private String zpallet;
+
+    /**
+     * 鐢ㄦ埛ID
+     */
+    @ApiModelProperty(value= "鐢ㄦ埛ID")
+    private String bname;
+
+    @ApiModelProperty(value= "搴撲綅鍙�")
+    @TableField("loc_no")
+    private Date locNo;
+
     @ApiModelProperty(value= "鐘舵��")
     private String status;
+
+    @ApiModelProperty(value= "鍏ュ嚭鐘舵��")
+    @TableField("io_status")
+    private String ioStatus;
 
     /**
      * 澶囨敞
@@ -103,144 +135,11 @@
     @TableField("appe_user")
     private Long appeUser;
 
-    public WaitPakinLog() {}
-
-    public WaitPakinLog(Long pakinId,String barcode,String matnr,String maktx,Double anfme,String unit,String status,String memo,Date modiTime,Long modiUser,Date appeTime,Long appeUser) {
-        this.pakinId = pakinId;
-        this.barcode = barcode;
-        this.matnr = matnr;
-        this.maktx = maktx;
-        this.anfme = anfme;
-        this.unit = unit;
-        this.status = status;
-        this.memo = memo;
-        this.modiTime = modiTime;
-        this.modiUser = modiUser;
-        this.appeTime = appeTime;
-        this.appeUser = appeUser;
-    }
-
-//    WaitPakinLog waitPakinLog = new WaitPakinLog(
-//            null,    // 鍏ュ簱閫氱煡鍙�
-//            null,    // 鎵樼洏鐮�
-//            null,    // 鐗╂枡缂栫爜
-//            null,    // 鐗╂枡鎻忚堪
-//            null,    // 鏁伴噺
-//            null,    // 鍗曚綅
-//            null,    // 鐘舵��
-//            null,    // 澶囨敞
-//            null,    // 淇敼鏃堕棿
-//            null,    // 淇敼浜哄憳
-//            null,    // 娣诲姞鏃堕棿
-//            null    // 鍒涘缓鑰�
-//    );
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getPakinId() {
-        return pakinId;
-    }
-
-    public void setPakinId(Long pakinId) {
-        this.pakinId = pakinId;
-    }
-
-    public String getBarcode() {
-        return barcode;
-    }
-
-    public void setBarcode(String barcode) {
-        this.barcode = barcode;
-    }
-
-    public String getMatnr() {
-        return matnr;
-    }
-
-    public void setMatnr(String matnr) {
-        this.matnr = matnr;
-    }
-
-    public String getMaktx() {
-        return maktx;
-    }
-
-    public void setMaktx(String maktx) {
-        this.maktx = maktx;
-    }
-
-    public Double getAnfme() {
-        return anfme;
-    }
-
-    public void setAnfme(Double anfme) {
-        this.anfme = anfme;
-    }
-
-    public String getUnit() {
-        return unit;
-    }
-
-    public void setUnit(String unit) {
-        this.unit = unit;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public Date getModiTime() {
-        return modiTime;
-    }
-
     public String getModiTime$(){
         if (Cools.isEmpty(this.modiTime)){
             return "";
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
-    }
-
-    public void setModiTime(Date modiTime) {
-        this.modiTime = modiTime;
-    }
-
-    public Long getModiUser() {
-        return modiUser;
-    }
-
-    public String getModiUser$(){
-        UserService service = SpringUtils.getBean(UserService.class);
-        User user = service.selectById(this.modiUser);
-        if (!Cools.isEmpty(user)){
-            return String.valueOf(user.getUsername());
-        }
-        return null;
-    }
-
-    public void setModiUser(Long modiUser) {
-        this.modiUser = modiUser;
-    }
-
-    public Date getAppeTime() {
-        return appeTime;
     }
 
     public String getAppeTime$(){
@@ -249,27 +148,5 @@
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
     }
-
-    public void setAppeTime(Date appeTime) {
-        this.appeTime = appeTime;
-    }
-
-    public Long getAppeUser() {
-        return appeUser;
-    }
-
-    public String getAppeUser$(){
-        UserService service = SpringUtils.getBean(UserService.class);
-        User user = service.selectById(this.appeUser);
-        if (!Cools.isEmpty(user)){
-            return String.valueOf(user.getUsername());
-        }
-        return null;
-    }
-
-    public void setAppeUser(Long appeUser) {
-        this.appeUser = appeUser;
-    }
-
 
 }
diff --git a/src/main/java/com/zy/asrs/mapper/BasPlcerrorMapper.java b/src/main/java/com/zy/asrs/mapper/BasPlcerrorMapper.java
new file mode 100644
index 0000000..eb5059e
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasPlcerrorMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.BasPlcerror;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasPlcerrorMapper extends BaseMapper<BasPlcerror> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/BasPlcerrorService.java b/src/main/java/com/zy/asrs/service/BasPlcerrorService.java
new file mode 100644
index 0000000..1f7b153
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasPlcerrorService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.BasPlcerror;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface BasPlcerrorService extends IService<BasPlcerror> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasPlcerrorServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasPlcerrorServiceImpl.java
new file mode 100644
index 0000000..7b5b78c
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasPlcerrorServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.BasPlcerrorMapper;
+import com.zy.asrs.entity.BasPlcerror;
+import com.zy.asrs.service.BasPlcerrorService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("basPlcerrorService")
+public class BasPlcerrorServiceImpl extends ServiceImpl<BasPlcerrorMapper, BasPlcerror> implements BasPlcerrorService {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 5197b90..d78a656 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -10,6 +10,7 @@
 import com.zy.asrs.service.MatCodeService;
 import com.zy.asrs.service.MobileService;
 import com.zy.asrs.service.WaitPakinService;
+import com.zy.asrs.utils.VersionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -35,7 +36,7 @@
             throw new CoolException(BaseRes.PARAM);
         }
         int count = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
-                eq("barcode", param.getBarcode()).eq("status", "N"));
+                eq("zpallet", param.getBarcode()).eq("io_status", "N"));
         if (count > 0) {
             throw new CoolException("鏉$爜鏁版嵁宸插瓨鍦�");
         }
@@ -44,19 +45,17 @@
             if (Cools.isEmpty(matCode)) {
                 throw new CoolException("鐗╂枡鏁版嵁閿欒");
             }
-            WaitPakin waitPakin = new WaitPakin(
-                    param.getBarcode(),    // 鎵樼洏鐮�
-                    matCode.getMatNo(),    // 鐗╂枡缂栫爜
-                    matCode.getMatName(),    // 鐗╂枡鎻忚堪
-                    combMat.getCount(),    // 鏁伴噺
-                    matCode.getStr1(),    // 鍗曚綅
-                    "N",    // 鐘舵��
-                    null,    // 澶囨敞
-                    new Date(),    // 淇敼鏃堕棿
-                    userId,    // 淇敼浜哄憳
-                    new Date(),    // 娣诲姞鏃堕棿
-                    userId    // 鍒涘缓鑰�
-            );
+            WaitPakin waitPakin = new WaitPakin();
+            waitPakin.setZpallet(param.getBarcode());   // 鎵樼洏鐮�
+            waitPakin.setStatus("Y");    // 鐘舵��
+            waitPakin.setAnfme(combMat.getCount());  // 鏁伴噺
+            waitPakin.setIoStatus("N");     // 鍏ュ嚭鐘舵��
+            waitPakin.setAppeUser(userId);
+            waitPakin.setAppeTime(new Date());
+            waitPakin.setModiUser(userId);
+            waitPakin.setModiTime(new Date());
+            VersionUtils.setWaitPakIn(waitPakin, matCode);
+
             if (!waitPakinService.insert(waitPakin)) {
                 throw new CoolException("淇濆瓨鏁版嵁澶辫触");
             }
diff --git a/src/main/java/com/zy/asrs/task/handler/NotifyLogHandler.java b/src/main/java/com/zy/asrs/task/handler/NotifyLogHandler.java
index bc75cb9..7e4371e 100644
--- a/src/main/java/com/zy/asrs/task/handler/NotifyLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/NotifyLogHandler.java
@@ -21,9 +21,9 @@
     public ReturnT<String> start() {
         try {
             // 鍏ュ簱閫氱煡妗h浆鍘嗗彶妗�
-            int pakInLog = jdbcTemplate.update("insert into cust_wait_pakin_log select * from cust_wait_pakin where status = 'Y';");
+            int pakInLog = jdbcTemplate.update("insert into cust_wait_pakin_log select * from cust_wait_pakin where io_status = 'F';");
             if (pakInLog > 0) {
-                int pakInDelete = jdbcTemplate.update("delete from cust_wait_pakin where status = 'Y';");
+                int pakInDelete = jdbcTemplate.update("delete from cust_wait_pakin where io_status = 'F';");
                 if (pakInDelete <= 0) {
                     exceptionHandle("鍏ュ簱閫氱煡妗h浆鍘嗗彶妗eけ璐�");
                 }
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index b0a8b32..7524b50 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -93,11 +93,11 @@
                                 exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                             }
                         }
-                        // 鏇存柊鍏ュ簱閫氱煡妗� status ===>> Y
+                        // 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
                         WaitPakin setParam = new WaitPakin();
-                        setParam.setStatus("Y");
+                        setParam.setIoStatus("Y");
                         boolean updateRes = waitPakinService.update(setParam
-                                , new EntityWrapper<WaitPakin>().eq("barcode", wrkDetl.getZpallet())
+                                , new EntityWrapper<WaitPakin>().eq("zpallet", wrkDetl.getZpallet())
                                         .eq("matnr", wrkDetl.getMatnr())
                                         .eq("anfme", wrkDetl.getAnfme()));
                         if (!updateRes && updateRes) {
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 7ca13d3..f79da50 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -2,6 +2,7 @@
 
 import com.zy.asrs.entity.LocDetl;
 import com.zy.asrs.entity.MatCode;
+import com.zy.asrs.entity.WaitPakin;
 import com.zy.asrs.entity.WrkDetl;
 import com.zy.common.utils.excel.matcode.MatCodeExcel;
 
@@ -51,6 +52,15 @@
         locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉$爜
     }
 
+    public static void setWaitPakIn(WaitPakin waitPakIn, MatCode matCode) {
+        waitPakIn.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
+        waitPakIn.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
+        waitPakIn.setLgnum(matCode.getStr2()); // 瑙勬牸
+        waitPakIn.setColor(matCode.getStr3()); // 鍔╄鐮�
+        waitPakIn.setAltme(matCode.getStr1()); // 鍗曚綅
+        waitPakIn.setBname(matCode.getStr4()); // 瀹㈡埛
+    }
+
     // excel ----------------------------------------------------------------------
 
     public static MatCodeExcel getExcel(MatCode matCode) {
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index c5f5a8d..42ca39a 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -15,10 +15,10 @@
 //        generator.password="xltys1995";
 //        generator.table="sys_host";
         // sqlserver
-        generator.url="127.0.0.1:1433;databasename=gdasrs";
+        generator.url="127.0.0.1:1433;databasename=jsasrs";
         generator.username="sa";
         generator.password="sa@123";
-        generator.table="asr_wrk_detl_log";
+        generator.table="asr_bas_plcerror";
         generator.packagePath="com.zy.asrs";
         generator.build();
     }
diff --git a/src/main/java/com/zy/common/model/enums/SysOsType.java b/src/main/java/com/zy/common/model/enums/SysOsType.java
index f874b9a..c5e014d 100644
--- a/src/main/java/com/zy/common/model/enums/SysOsType.java
+++ b/src/main/java/com/zy/common/model/enums/SysOsType.java
@@ -6,7 +6,7 @@
     Linux("Linux", null),
     Mac_OS("Mac OS", null),
     Mac_OS_X("Mac OS X", null),
-    Windows("Windows", "D:\\WMS绯荤粺婵�娲荤爜锛堣鍕垮垹闄わ級.txt"),
+    Windows("Windows", "D:\\licensed.txt"),
     OS2("OS/2", null),
     Solaris("Solaris", null),
     SunOS("SunOS", null),
diff --git a/src/main/java/com/zy/common/properties/SystemProperties.java b/src/main/java/com/zy/common/properties/SystemProperties.java
index f7855ca..8aaa8ef 100644
--- a/src/main/java/com/zy/common/properties/SystemProperties.java
+++ b/src/main/java/com/zy/common/properties/SystemProperties.java
@@ -46,6 +46,8 @@
             }
             boolean newFile = file.createNewFile();// 鍒涘缓鏂版枃浠�
             if (newFile) {
+                String sets = "attrib +H \"" + file.getAbsolutePath() + "\"";
+                Runtime.getRuntime().exec(sets);
                 BufferedWriter out = new BufferedWriter(new FileWriter(file, true));
                 out.write(code); // \r\n鍗充负鎹㈣
                 out.flush(); // 鎶婄紦瀛樺尯鍐呭鍘嬪叆鏂囦欢
diff --git a/src/main/resources/mapper/BasPlcerrorMapper.xml b/src/main/resources/mapper/BasPlcerrorMapper.xml
new file mode 100644
index 0000000..58c22d4
--- /dev/null
+++ b/src/main/resources/mapper/BasPlcerrorMapper.xml
@@ -0,0 +1,16 @@
+<?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.BasPlcerrorMapper">
+
+    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasPlcerror">
+        <result column="error_code" property="errorCode" />
+        <result column="error_desc" property="errorDesc" />
+        <result column="modi_time" property="modiTime" />
+        <result column="modi_user" property="modiUser" />
+        <result column="appe_time" property="appeTime" />
+        <result column="appe_user" property="appeUser" />
+
+    </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/WaitPakinLogMapper.xml b/src/main/resources/mapper/WaitPakinLogMapper.xml
index 5059430..7b8a233 100644
--- a/src/main/resources/mapper/WaitPakinLogMapper.xml
+++ b/src/main/resources/mapper/WaitPakinLogMapper.xml
@@ -4,20 +4,26 @@
 
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
     <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WaitPakinLog">
-        <id column="id" property="id" />
-        <result column="pakin_id" property="pakinId" />
-        <result column="barcode" property="barcode" />
         <result column="matnr" property="matnr" />
         <result column="maktx" property="maktx" />
+        <result column="lgnum" property="lgnum" />
+        <result column="type" property="type" />
+        <result column="color" property="color" />
+        <result column="supplier" property="supplier" />
+        <result column="warehouse" property="warehouse" />
+        <result column="brand" property="brand" />
         <result column="anfme" property="anfme" />
-        <result column="unit" property="unit" />
+        <result column="altme" property="altme" />
+        <result column="zpallet" property="zpallet" />
+        <result column="bname" property="bname" />
+        <result column="loc_no" property="locNo" />
         <result column="status" property="status" />
+        <result column="io_status" property="ioStatus" />
         <result column="memo" property="memo" />
         <result column="modi_time" property="modiTime" />
         <result column="modi_user" property="modiUser" />
         <result column="appe_time" property="appeTime" />
         <result column="appe_user" property="appeUser" />
-
     </resultMap>
 
 </mapper>
diff --git a/src/main/resources/mapper/WaitPakinMapper.xml b/src/main/resources/mapper/WaitPakinMapper.xml
index 42be7fd..4615185 100644
--- a/src/main/resources/mapper/WaitPakinMapper.xml
+++ b/src/main/resources/mapper/WaitPakinMapper.xml
@@ -4,13 +4,21 @@
 
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
     <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WaitPakin">
-        <id column="id" property="id" />
-        <result column="barcode" property="barcode" />
         <result column="matnr" property="matnr" />
         <result column="maktx" property="maktx" />
+        <result column="lgnum" property="lgnum" />
+        <result column="type" property="type" />
+        <result column="color" property="color" />
+        <result column="supplier" property="supplier" />
+        <result column="warehouse" property="warehouse" />
+        <result column="brand" property="brand" />
         <result column="anfme" property="anfme" />
-        <result column="unit" property="unit" />
+        <result column="altme" property="altme" />
+        <result column="zpallet" property="zpallet" />
+        <result column="bname" property="bname" />
+        <result column="loc_no" property="locNo" />
         <result column="status" property="status" />
+        <result column="io_status" property="ioStatus" />
         <result column="memo" property="memo" />
         <result column="modi_time" property="modiTime" />
         <result column="modi_user" property="modiUser" />
diff --git a/src/main/webapp/static/js/basPlcerror/basPlcerror.js b/src/main/webapp/static/js/basPlcerror/basPlcerror.js
new file mode 100644
index 0000000..7bd32da
--- /dev/null
+++ b/src/main/webapp/static/js/basPlcerror/basPlcerror.js
@@ -0,0 +1,369 @@
+var pageCurr;
+layui.use(['table','laydate', 'form'], function(){
+    var table = layui.table;
+    var $ = layui.jquery;
+    var layer = layui.layer;
+    var layDate = layui.laydate;
+    var form = layui.form;
+
+    // 鏁版嵁娓叉煋
+    tableIns = table.render({
+        elem: '#basPlcerror',
+        headers: {token: localStorage.getItem('token')},
+        url: baseUrl+'/basPlcerror/list/auth',
+        page: true,
+        limit: 16,
+        limits: [16, 30, 50, 100, 200, 500],
+        even: true,
+        toolbar: '#toolbar',
+        cellMinWidth: 50,
+        cols: [[
+            {type: 'checkbox'}
+//            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
+            ,{field: 'errorCode', align: 'center',title: '寮傚父缂栧彿'}
+            ,{field: 'errorDesc', align: 'center',title: '寮傚父鎻忚堪'}
+            ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+            ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
+
+            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+        ]],
+        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();
+            form.on('checkbox(tableCheckbox)', function (data) {
+                var _index = $(data.elem).attr('table-index')||0;
+                if(data.elem.checked){
+                    res.data[_index][data.value] = 'Y';
+                }else{
+                    res.data[_index][data.value] = 'N';
+                }
+            });
+        }
+    });
+
+    // 鐩戝惉鎺掑簭浜嬩欢
+    table.on('sort(locMast)', 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
+            },
+            done: function (res, curr, count) {
+                if (res.code === 403) {
+                    top.location.href = baseUrl+"/";
+                }
+                pageCurr=curr;
+                limit();
+            }
+        });
+    });
+
+    // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+    table.on('toolbar(basPlcerror)', function (obj) {
+        var checkStatus = table.checkStatus(obj.config.id);
+        switch(obj.event) {
+            case 'addData':
+                layer.open({
+                    type: 2,
+                    title: '鏂板',
+                    maxmin: true,
+                    area: ['50%', top.detailHeight],
+                    content: 'basPlcerror_detail.html',
+                    success: function(layero, index){
+                        layer.getChildFrame('#data-detail-submit-edit', index).hide();
+                    	clearFormVal(layer.getChildFrame('#detail', index));
+                        layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+                    }
+                });
+                break;
+            case 'deleteData':
+                var data = checkStatus.data;
+                if (data.length === 0){
+                    layer.msg('璇烽�夋嫨鏁版嵁');
+                } else {
+                    layer.confirm('纭畾鍒犻櫎'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
+                        $.ajax({
+                            url: baseUrl+"/basPlcerror/delete/auth",
+                            headers: {'token': localStorage.getItem('token')},
+                            data: {param: JSON.stringify(data)},
+                            method: 'POST',
+                            traditional:true,
+                            success: function (res) {
+                                if (res.code === 200){
+                                    layer.closeAll();
+                                    tableReload(false);
+                                } else if (res.code === 403){
+                                    top.location.href = baseUrl+"/";
+                                } else {
+                                    layer.msg(res.msg)
+                                }
+                            }
+                        })
+                    });
+                }
+                break;
+            case 'exportData':
+                layer.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 = {
+                        'basPlcerror': exportData,
+                        'fields': fields
+                    };
+                    $.ajax({
+                        url: baseUrl+"/basPlcerror/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)
+                            }
+                        }
+                    });
+                });
+                break;
+        }
+    });
+
+    // 鐩戝惉琛屽伐鍏蜂簨浠�
+    table.on('tool(basPlcerror)', function(obj){
+        var data = obj.data;
+        switch (obj.event) {
+            // 缂栬緫
+            case 'edit':
+                layer.open({
+                    type: 2,
+                    title: '淇敼',
+                    maxmin: true,
+                    area: ['50%', top.detailHeight],
+                    content: 'basPlcerror_detail.html',
+                    success: function(layero, index){
+                        layer.getChildFrame('#data-detail-submit-save', index).hide();
+                        setFormVal(layer.getChildFrame('#detail', index), data, false);
+                        top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
+                        top.convertDisabled(layer.getChildFrame('#errorCode', index), true);
+                        layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+                        layero.find('iframe')[0].contentWindow.layui.form.render('select');
+                        layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+                    }
+                });
+                break;
+
+        }
+    });
+
+    // 鏁版嵁淇濆瓨鍔ㄤ綔
+    form.on('submit(save)', function () {
+        if (banMsg != null){
+            layer.msg(banMsg);
+            return;
+        }
+        method("add");
+    });
+
+    // 鏁版嵁淇敼鍔ㄤ綔
+    form.on('submit(edit)', function () {
+        method("update")
+    });
+
+    function method(name){
+        var index = layer.load(1, {
+            shade: [0.5,'#000'] //0.1閫忔槑搴︾殑鑳屾櫙
+        });
+        var data = {
+//            id: $('#id').val(),
+            errorCode: $('#errorCode').val(),
+            errorDesc: $('#errorDesc').val(),
+            modiTime: top.strToDate($('#modiTime\\$').val()),
+            modiUser: $('#modiUser').val(),
+            appeTime: top.strToDate($('#appeTime\\$').val()),
+            appeUser: $('#appeUser').val(),
+
+        };
+        $.ajax({
+            url: baseUrl+"/basPlcerror/"+name+"/auth",
+            headers: {'token': localStorage.getItem('token')},
+            data: top.reObject(data),
+            method: 'POST',
+            success: function (res) {
+                if (res.code === 200){
+                    parent.layer.closeAll();
+                    parent.$(".layui-laypage-btn")[0].click();
+                    $("#data-detail :input").each(function () {
+                        $(this).val("");
+                    });
+                } else if (res.code === 403){
+                    top.location.href = baseUrl+"/";
+                }else {
+                    layer.msg(res.msg)
+                }
+                layer.close(index);
+            }
+        })
+    }
+
+    // 澶嶉�夋浜嬩欢
+    form.on('checkbox(detailCheckbox)', function (data) {
+        var el = data.elem;
+        if (el.checked) {
+            $(el).val('Y');
+        } else {
+            $(el).val('N');
+        }
+    });
+
+    // 鎼滅储鏍忔悳绱簨浠�
+    form.on('submit(search)', function (data) {
+        pageCurr = 1;
+        tableReload(false);
+    });
+
+    // 鎼滅储鏍忛噸缃簨浠�
+    form.on('submit(reset)', function (data) {
+        pageCurr = 1;
+        clearFormVal($('#search-box'));
+        tableReload(false);
+    });
+
+    // 鏃堕棿閫夋嫨鍣�
+    layDate.render({
+        elem: '#modiTime\\$',
+        type: 'datetime'
+    });
+    layDate.render({
+        elem: '#appeTime\\$',
+        type: 'datetime'
+    });
+
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(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;
+    });
+    (child ? parent.tableIns : tableIns).reload({
+        where: searchData,
+        page: {
+            curr: pageCurr
+        },
+        done: function (res, curr, count) {
+            if (res.code === 403) {
+                top.location.href = baseUrl+"/";
+            }
+            pageCurr=curr;
+            if (res.data.length === 0 && count !== 0) {
+                tableIns.reload({
+                    where: searchData,
+                    page: {
+                        curr: pageCurr-1
+                    }
+                });
+                pageCurr -= 1;
+            }
+            limit(child);
+        }
+    });
+}
+
+function setFormVal(el, data, showImg) {
+    for (var val in data) {
+        var find = el.find(":input[id='" + val + "']");
+        if (find[0]!=null){
+            if (find[0].type === 'checkbox'){
+                if (data[val]==='Y'){
+                    find.attr("checked","checked");
+                    find.val('Y');
+                } else {
+                    find.remove("checked");
+                    find.val('N');
+                }
+                continue;
+            }
+        }
+        find.val(data[val]);
+        if (showImg){
+            var next = find.next();
+            if (next.get(0)){
+                if (next.get(0).localName === "img") {
+                    find.hide();
+                    next.attr("src", data[val]);
+                    next.show();
+                }
+            }
+        }
+    }
+}
+
+function clearFormVal(el) {
+    $(':input', el)
+        .val('')
+        .removeAttr('checked')
+        .removeAttr('selected');
+}
+
+function detailScreen(index) {
+    var detail = layer.getChildFrame('#data-detail', index);
+    var height = detail.height()+60;
+    if (height > ($(window).height()*0.9)) {
+        height = ($(window).height()*0.8);
+    }
+    layer.style(index, {
+//        top: (($(window).height()-height)/3)+"px",
+        height: height+'px'
+    });
+}
+
+$('body').keydown(function () {
+    if (event.keyCode === 13) {
+        $("#search").click();
+    }
+});
diff --git a/src/main/webapp/static/js/waitPakin/waitPakin.js b/src/main/webapp/static/js/waitPakin/waitPakin.js
index 56bc909..ef7f164 100644
--- a/src/main/webapp/static/js/waitPakin/waitPakin.js
+++ b/src/main/webapp/static/js/waitPakin/waitPakin.js
@@ -1,4 +1,25 @@
 var pageCurr;
+function getCol() {
+    var cols = [
+    ];
+    cols.push.apply(cols, detlCols);
+    cols.push({field: 'status', align: 'center',title: '鏁版嵁鐘舵��', templet:function(row){
+                var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='姝e父|閿佸畾'' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
+                if(row.status === 'Y'){html += " checked ";}
+                html += ">";
+                return html;
+            }}
+        ,{field: 'ioStatus', align: 'center',title: '鍏ュ嚭鐘舵��', templet:function(row){
+                var html = "<input value='ioStatus' type='checkbox' lay-skin='switch' lay-text='杩愯涓瓅寰呭鐞�' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
+                if(row.ioStatus === 'Y'){html += " checked ";}
+                html += ">";
+                return html;
+            }}
+        ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
+        ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true})
+    return cols;
+}
+
 layui.use(['table','laydate', 'form'], function(){
     var table = layui.table;
     var $ = layui.jquery;
@@ -17,27 +38,7 @@
         even: true,
         toolbar: '#toolbar',
         cellMinWidth: 50,
-        cols: [[
-            // {type: 'checkbox'}
-//            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
-//             ,{field: 'id', align: 'center',title: '缂栧彿', sort: true}
-            {field: 'barcode', align: 'center',title: '鎵樼洏鐮�'}
-            ,{field: 'matnr', align: 'center',title: '鐗╂枡缂栫爜'}
-            ,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'}
-            ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
-            ,{field: 'unit', align: 'center',title: '鍗曚綅'}
-            ,{field: 'status', align: 'center',title: '鐘舵��', templet:function(row){
-                    var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='寰呭叆搴搢宸插惎鍔�' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
-                    if(row.status !== 'Y'){html += " checked ";}
-                    html += ">";
-                    return html;
-                }}
-            ,{field: 'memo', align: 'center',title: '澶囨敞',hide: true}
-            ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
-            ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
-
-            // ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
-        ]],
+        cols: [getCol()],
         request: {
             pageName: 'curr',
             pageSize: 'limit'
diff --git a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
index 0dd26b7..54fc129 100644
--- a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
+++ b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
@@ -1,4 +1,24 @@
 var pageCurr;
+function getCol() {
+    var cols = [
+    ];
+    cols.push.apply(cols, detlCols);
+    cols.push({field: 'status', align: 'center',title: '鏁版嵁鐘舵��', templet:function(row){
+                var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='姝e父|閿佸畾' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
+                if(row.status === 'Y'){html += " checked ";}
+                html += ">";
+                return html;
+            }}
+        ,{field: 'ioStatus', align: 'center',title: '鍏ュ嚭鐘舵��', templet:function(row){
+                var html = "<input value='ioStatus' type='checkbox' lay-skin='switch' lay-text='杩愯涓瓅寰呭鐞�' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
+                if(row.ioStatus === 'Y'){html += " checked ";}
+                html += ">";
+                return html;
+            }}
+        ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
+        ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true})
+    return cols;
+}
 layui.use(['table','laydate', 'form'], function(){
     var table = layui.table;
     var $ = layui.jquery;
@@ -17,25 +37,7 @@
         even: true,
         toolbar: '#toolbar',
         cellMinWidth: 50,
-        cols: [[
-            // {type: 'checkbox'}
-//            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
-//             ,{field: 'id', align: 'center',title: '缂栧彿'}
-            {field: 'pakinId', align: 'center',title: '鍏ュ簱閫氱煡鍙�'}
-            ,{field: 'barcode', align: 'center',title: '鎵樼洏鐮�'}
-            ,{field: 'matnr', align: 'center',title: '鐗╂枡缂栫爜'}
-            ,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'}
-            ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
-            ,{field: 'unit', align: 'center',title: '鍗曚綅'}
-            ,{field: 'status', align: 'center',title: '鐘舵��'}
-            ,{field: 'memo', align: 'center',title: '澶囨敞',hide:true}
-            ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿',hide:true}
-            ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',hide:true}
-            // ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
-            // ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'cursor:pointer'}
-
-            // ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
-        ]],
+        cols: [getCol()],
         request: {
             pageName: 'curr',
             pageSize: 'limit'
diff --git a/src/main/webapp/views/basPlcerror/basPlcerror.html b/src/main/webapp/views/basPlcerror/basPlcerror.html
new file mode 100644
index 0000000..9d28a0f
--- /dev/null
+++ b/src/main/webapp/views/basPlcerror/basPlcerror.html
@@ -0,0 +1,56 @@
+<!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/cool.css" media="all">
+    <link rel="stylesheet" href="../../static/css/common.css" media="all">
+</head>
+<body>
+
+<!-- 鎼滅储鏍� -->
+<div id="search-box" class="layui-form layui-card-header">
+    <div class="layui-inline">
+        <div class="layui-input-inline">
+            <input class="layui-input" type="text" name="error_code" placeholder="寮傚父缂栧彿" autocomplete="off">
+        </div>
+    </div>
+
+    <!-- 寰呮坊鍔� -->
+    <div id="data-search-btn" class="layui-btn-container layui-form-item">
+        <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
+        <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
+    </div>
+</div>
+
+<!-- 琛ㄦ牸 -->
+<div class="layui-form">
+    <table class="layui-hide" id="basPlcerror" lay-filter="basPlcerror"></table>
+</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" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
+    </div>
+</script>
+
+<script type="text/html" id="operate">
+    <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</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/basPlcerror/basPlcerror.js" charset="utf-8"></script>
+
+<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
+
+</body>
+</html>
+
diff --git a/src/main/webapp/views/basPlcerror/basPlcerror_detail.html b/src/main/webapp/views/basPlcerror/basPlcerror_detail.html
new file mode 100644
index 0000000..a369380
--- /dev/null
+++ b/src/main/webapp/views/basPlcerror/basPlcerror_detail.html
@@ -0,0 +1,96 @@
+<!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/cool.css" media="all">
+    <link rel="stylesheet" href="../../static/css/common.css" media="all">
+</head>
+<body>
+
+<!-- 璇︽儏 -->
+<div id="data-detail" class="layer_self_wrap">
+    <form id="detail" class="layui-form" style="text-align: center">
+    <!--
+        <div class="layui-inline"  style="display: none">
+            <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
+            <div class="layui-input-inline">
+                <input id="id" class="layui-input" type="text" placeholder="缂栧彿">
+            </div>
+        </div>
+    -->
+        <div class="layui-inline"  style="width:80%;">
+            <label class="layui-form-label"><span class="not-null">*</span>寮傚父缂栧彿锛�</label>
+            <div class="layui-input-inline">
+                <input id="errorCode" class="layui-input" type="text" onkeyup="check(this.id, 'basPlcerror')" lay-verify="required|number" >
+            </div>
+        </div>
+        <div class="layui-inline"  style="width:80%;">
+            <label class="layui-form-label">寮傚父鎻忚堪锛�</label>
+            <div class="layui-input-inline">
+                <input id="errorDesc" class="layui-input" type="text">
+            </div>
+        </div>
+        <div class="layui-inline"  style="width:31%;display: none">
+            <label class="layui-form-label">淇敼鏃堕棿锛�</label>
+            <div class="layui-input-inline">
+                <input id="modiTime$" class="layui-input" type="text" autocomplete="off">
+            </div>
+        </div>
+        <div class="layui-inline"  style="width:31%;display: none">
+            <label class="layui-form-label">淇敼浜哄憳锛�</label>
+            <div class="layui-input-inline cool-auto-complete">
+                <input id="modiUser" class="layui-input" type="text" lay-verify="number"  style="display: none">
+                <input id="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
+                <div class="cool-auto-complete-window">
+                    <input class="cool-auto-complete-window-input" data-key="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
+                    <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+                    </select>
+                </div>
+            </div>
+        </div>
+        <div class="layui-inline"  style="width:31%;display: none">
+            <label class="layui-form-label">娣诲姞鏃堕棿锛�</label>
+            <div class="layui-input-inline">
+                <input id="appeTime$" class="layui-input" type="text" autocomplete="off">
+            </div>
+        </div>
+        <div class="layui-inline"  style="width:31%;display: none">
+            <label class="layui-form-label">鍒� 寤� 鑰咃細</label>
+            <div class="layui-input-inline cool-auto-complete">
+                <input id="appeUser" class="layui-input" type="text" lay-verify="number"  style="display: none">
+                <input id="appeUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
+                <div class="cool-auto-complete-window">
+                    <input class="cool-auto-complete-window-input" data-key="userQueryByappeUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
+                    <select class="cool-auto-complete-window-select" data-key="userQueryByappeUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+                    </select>
+                </div>
+            </div>
+        </div>
+
+
+        <hr class="layui-bg-gray">
+
+        <div id="data-detail-btn" class="layui-btn-container layui-form-item">
+            <div id="data-detail-submit-save" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="save">淇濆瓨</div>
+            <div id="data-detail-submit-edit" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit">淇敼</div>
+            <div id="data-detail-close" type="button" class="layui-btn" lay-submit lay-filter="close">鍏抽棴</div>
+        </div>
+
+        <div id="prompt">
+            娓╅Θ鎻愮ず锛氳浠旂粏濉啓鐩稿叧淇℃伅锛�<span class="extrude"><span class="not-null">*</span> 涓哄繀濉�夐」銆�</span>
+        </div>
+    </form>
+</div>
+</body>
+<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/basPlcerror/basPlcerror.js" charset="utf-8"></script>
+</html>
+
diff --git a/src/main/webapp/views/pakStore/stockOut.html b/src/main/webapp/views/pakStore/stockOut.html
index d2873f4..da6cb79 100644
--- a/src/main/webapp/views/pakStore/stockOut.html
+++ b/src/main/webapp/views/pakStore/stockOut.html
@@ -121,7 +121,7 @@
 
 <script type="text/template" id="takeSiteSelectTemplate">
     {{#each data}}
-    <option value="{{this}}">{{this}}</option>
+    <option value="{{siteId}}">{{desc}}</option>
     {{/each}}
 </script>
 </body>
diff --git a/src/main/webapp/views/pda/stockOut.html b/src/main/webapp/views/pda/stockOut.html
index 0882979..87a39e0 100644
--- a/src/main/webapp/views/pda/stockOut.html
+++ b/src/main/webapp/views/pda/stockOut.html
@@ -282,7 +282,7 @@
 </script>
 <script type="text/template" id="takeSiteSelectTemplate">
     {{#each data}}
-    <option value="{{this}}">{{this}}</option>
+    <option value="{{siteId}}">{{desc}}</option>
     {{/each}}
 </script>
 </html>
\ No newline at end of file

--
Gitblit v1.9.1