From 06cca500d130751ffb880d860bd919ff58ddca3e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 19 八月 2020 17:23:18 +0800
Subject: [PATCH] #入库通知档调整

---
 src/main/java/com/zy/asrs/controller/WaitPakinLogController.java |    8 
 src/main/java/com/zy/asrs/entity/WaitPakinLog.java               |  243 +++++----------------
 src/main/java/com/zy/asrs/utils/VersionUtils.java                |   10 
 src/main/java/com/zy/asrs/entity/WaitPakin.java                  |  227 +++++---------------
 src/main/webapp/static/js/waitPakin/waitPakin.js                 |   43 ++-
 src/main/resources/mapper/WaitPakinMapper.xml                    |   14 +
 src/main/resources/mapper/WaitPakinLogMapper.xml                 |   16 +
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java    |   27 +-
 src/main/webapp/static/js/waitPakinLog/waitPakinLog.js           |   40 +-
 src/main/java/com/zy/asrs/controller/WaitPakinController.java    |    6 
 10 files changed, 215 insertions(+), 419 deletions(-)

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/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/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 5197b90..aa619aa 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("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("N");    // 鐘舵��
+            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/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/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/waitPakin/waitPakin.js b/src/main/webapp/static/js/waitPakin/waitPakin.js
index 56bc909..7d87f3e 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='寰呭叆搴搢宸插惎鍔�' 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..0e3e360 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='寰呭叆搴搢宸插惎鍔�' 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'

--
Gitblit v1.9.1