From 09c2a138e9f053a7d2f13a41a8bc8fbfe6172b70 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 04 八月 2020 15:55:15 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java |   31 
 src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java |   28 
 src/main/java/com/zy/asrs/entity/BasDevp.java                  |  299 ++++++
 src/main/resources/mapper/LocMastMapper.xml                    |   44 
 src/main/java/com/zy/common/Main.java                          |   77 +
 src/main/java/com/zy/asrs/entity/WrkMast.java                  | 1014 ++++++++++++++++++++++
 src/main/java/com/zy/asrs/service/BasDevpService.java          |   47 +
 src/main/resources/mapper/WrkMastMapper.xml                    |   78 +
 src/main/java/com/zy/asrs/mapper/BasDevpMapper.java            |   18 
 src/main/java/com/zy/asrs/entity/BasCrnp.java                  |  436 +++++++++
 src/main/java/com/zy/asrs/service/BasCrnpService.java          |   10 
 src/main/resources/mapper/BasCrnpMapper.xml                    |   31 
 pom.xml                                                        |    6 
 src/main/java/com/zy/asrs/mapper/BasCrnpMapper.java            |   12 
 src/main/java/com/zy/asrs/service/WrkMastService.java          |   16 
 src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java |   30 
 src/main/java/com/zy/asrs/mapper/LocMastMapper.java            |   21 
 src/main/java/com/zy/asrs/mapper/WrkMastMapper.java            |   19 
 src/main/java/com/zy/asrs/entity/LocMast.java                  |  272 ++++++
 src/main/java/com/zy/asrs/service/LocMastService.java          |   21 
 src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java |   67 +
 src/main/resources/mapper/BasDevpMapper.xml                    |   69 +
 22 files changed, 2,617 insertions(+), 29 deletions(-)

diff --git a/pom.xml b/pom.xml
index df4cc25..901114c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,6 +86,12 @@
             <artifactId>easyexcel</artifactId>
             <version>2.0.5</version>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.16.22</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnp.java b/src/main/java/com/zy/asrs/entity/BasCrnp.java
new file mode 100644
index 0000000..2ce3c36
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasCrnp.java
@@ -0,0 +1,436 @@
+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.asrs.service.BasDevpService;
+import com.zy.asrs.service.LocMastService;
+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_crnp")
+public class BasCrnp implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 缂栧彿
+     */
+    @ApiModelProperty(value= "缂栧彿")
+    @TableId(value = "crn_no", type = IdType.INPUT)
+    @TableField("crn_no")
+    private Integer crnNo;
+
+    /**
+     * 鍙叆
+     */
+    @ApiModelProperty(value= "鍙叆")
+    @TableField("in_enable")
+    private String inEnable;
+
+    /**
+     * 鍙嚭
+     */
+    @ApiModelProperty(value= "鍙嚭")
+    @TableField("out_enable")
+    private String outEnable;
+
+    /**
+     * 鐘舵��
+     */
+    @ApiModelProperty(value= "鐘舵��")
+    @TableField("crn_sts")
+    private Integer crnSts;
+
+    /**
+     * 宸ヤ綔鍙�
+     */
+    @ApiModelProperty(value= "宸ヤ綔鍙�")
+    @TableField("wrk_no")
+    private Integer wrkNo;
+
+    /**
+     * 寮傚父鐮�
+     */
+    @ApiModelProperty(value= "寮傚父鐮�")
+    @TableField("crn_err")
+    private Long crnErr;
+
+    /**
+     * 婧愬簱浣�
+     */
+    @ApiModelProperty(value= "婧愬簱浣�")
+    @TableField("frm_locno")
+    private String frmLocno;
+
+    /**
+     * 婧愮珯
+     */
+    @ApiModelProperty(value= "婧愮珯")
+    @TableField("frm_sta")
+    private Integer frmSta;
+
+    /**
+     * 鐩爣绔�
+     */
+    @ApiModelProperty(value= "鐩爣绔�")
+    @TableField("to_sta")
+    private Integer toSta;
+
+    /**
+     * 鐩爣搴撲綅
+     */
+    @ApiModelProperty(value= "鐩爣搴撲綅")
+    @TableField("to_locno")
+    private String toLocno;
+
+    /**
+     * 鍒涘缓鑰�
+     */
+    @ApiModelProperty(value= "鍒涘缓鑰�")
+    @TableField("appe_user")
+    private Long appeUser;
+
+    /**
+     * 鍒涘缓鏃堕棿
+     */
+    @ApiModelProperty(value= "鍒涘缓鏃堕棿")
+    @TableField("appe_time")
+    private Date appeTime;
+
+    /**
+     * 淇敼浜哄憳
+     */
+    @ApiModelProperty(value= "淇敼浜哄憳")
+    @TableField("modi_user")
+    private Long modiUser;
+
+    /**
+     * 淇敼鏃堕棿
+     */
+    @ApiModelProperty(value= "淇敼鏃堕棿")
+    @TableField("modi_time")
+    private Date modiTime;
+
+    @ApiModelProperty(value= "")
+    @TableField("hp_mk")
+    private String hpMk;
+
+    @ApiModelProperty(value= "")
+    @TableField("retrieve_mk")
+    private String retrieveMk;
+
+    @ApiModelProperty(value= "")
+    @TableField("ctl_hp")
+    private String ctlHp;
+
+    @ApiModelProperty(value= "")
+    @TableField("ctl_rest")
+    private String ctlRest;
+
+    @ApiModelProperty(value= "")
+    @TableField("emp_in")
+    private String empIn;
+
+    @ApiModelProperty(value= "")
+    @TableField("tank_qty")
+    private Integer tankQty;
+
+    @ApiModelProperty(value= "")
+    @TableField("tank_qty1")
+    private Integer tankQty1;
+
+    public BasCrnp() {}
+
+    public BasCrnp(String inEnable,String outEnable,Integer crnSts,Integer wrkNo,Long crnErr,String frmLocno,Integer frmSta,Integer toSta,String toLocno,Long appeUser,Date appeTime,Long modiUser,Date modiTime,String hpMk,String retrieveMk,String ctlHp,String ctlRest,String empIn,Integer tankQty,Integer tankQty1) {
+        this.inEnable = inEnable;
+        this.outEnable = outEnable;
+        this.crnSts = crnSts;
+        this.wrkNo = wrkNo;
+        this.crnErr = crnErr;
+        this.frmLocno = frmLocno;
+        this.frmSta = frmSta;
+        this.toSta = toSta;
+        this.toLocno = toLocno;
+        this.appeUser = appeUser;
+        this.appeTime = appeTime;
+        this.modiUser = modiUser;
+        this.modiTime = modiTime;
+        this.hpMk = hpMk;
+        this.retrieveMk = retrieveMk;
+        this.ctlHp = ctlHp;
+        this.ctlRest = ctlRest;
+        this.empIn = empIn;
+        this.tankQty = tankQty;
+        this.tankQty1 = tankQty1;
+    }
+
+//    BasCrnp basCrnp = new BasCrnp(
+//            null,    // 鍙叆
+//            null,    // 鍙嚭
+//            null,    // 鐘舵��
+//            null,    // 宸ヤ綔鍙�
+//            null,    // 寮傚父鐮�
+//            null,    // 婧愬簱浣�
+//            null,    // 婧愮珯
+//            null,    // 鐩爣绔�
+//            null,    // 鐩爣搴撲綅
+//            null,    // 鍒涘缓鑰�
+//            null,    // 鍒涘缓鏃堕棿
+//            null,    // 淇敼浜哄憳
+//            null,    // 淇敼鏃堕棿
+//            null,    // 
+//            null,    // 
+//            null,    // 
+//            null,    // 
+//            null,    // 
+//            null,    // 
+//            null    // 
+//    );
+
+    public Integer getCrnNo() {
+        return crnNo;
+    }
+
+    public void setCrnNo(Integer crnNo) {
+        this.crnNo = crnNo;
+    }
+
+    public String getInEnable() {
+        return inEnable;
+    }
+
+    public void setInEnable(String inEnable) {
+        this.inEnable = inEnable;
+    }
+
+    public String getOutEnable() {
+        return outEnable;
+    }
+
+    public void setOutEnable(String outEnable) {
+        this.outEnable = outEnable;
+    }
+
+    public Integer getCrnSts() {
+        return crnSts;
+    }
+
+    public void setCrnSts(Integer crnSts) {
+        this.crnSts = crnSts;
+    }
+
+    public Integer getWrkNo() {
+        return wrkNo;
+    }
+
+    public void setWrkNo(Integer wrkNo) {
+        this.wrkNo = wrkNo;
+    }
+
+    public Long getCrnErr() {
+        return crnErr;
+    }
+
+    public void setCrnErr(Long crnErr) {
+        this.crnErr = crnErr;
+    }
+
+    public String getFrmLocno() {
+        return frmLocno;
+    }
+
+    public String getFrmLocno$(){
+        LocMastService service = SpringUtils.getBean(LocMastService.class);
+        LocMast locMast = service.selectById(this.frmLocno);
+        if (!Cools.isEmpty(locMast)){
+            return String.valueOf(locMast.getLocNo());
+        }
+        return null;
+    }
+
+    public void setFrmLocno(String frmLocno) {
+        this.frmLocno = frmLocno;
+    }
+
+    public Integer getFrmSta() {
+        return frmSta;
+    }
+
+    public String getFrmSta$(){
+        BasDevpService service = SpringUtils.getBean(BasDevpService.class);
+        BasDevp basDevp = service.selectById(this.frmSta);
+        if (!Cools.isEmpty(basDevp)){
+            return String.valueOf(basDevp.getDevNo());
+        }
+        return null;
+    }
+
+    public void setFrmSta(Integer frmSta) {
+        this.frmSta = frmSta;
+    }
+
+    public Integer getToSta() {
+        return toSta;
+    }
+
+    public String getToSta$(){
+        BasDevpService service = SpringUtils.getBean(BasDevpService.class);
+        BasDevp basDevp = service.selectById(this.toSta);
+        if (!Cools.isEmpty(basDevp)){
+            return String.valueOf(basDevp.getDevNo());
+        }
+        return null;
+    }
+
+    public void setToSta(Integer toSta) {
+        this.toSta = toSta;
+    }
+
+    public String getToLocno() {
+        return toLocno;
+    }
+
+    public String getToLocno$(){
+        LocMastService service = SpringUtils.getBean(LocMastService.class);
+        LocMast locMast = service.selectById(this.toLocno);
+        if (!Cools.isEmpty(locMast)){
+            return String.valueOf(locMast.getLocNo());
+        }
+        return null;
+    }
+
+    public void setToLocno(String toLocno) {
+        this.toLocno = toLocno;
+    }
+
+    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;
+    }
+
+    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 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 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 String getHpMk() {
+        return hpMk;
+    }
+
+    public void setHpMk(String hpMk) {
+        this.hpMk = hpMk;
+    }
+
+    public String getRetrieveMk() {
+        return retrieveMk;
+    }
+
+    public void setRetrieveMk(String retrieveMk) {
+        this.retrieveMk = retrieveMk;
+    }
+
+    public String getCtlHp() {
+        return ctlHp;
+    }
+
+    public void setCtlHp(String ctlHp) {
+        this.ctlHp = ctlHp;
+    }
+
+    public String getCtlRest() {
+        return ctlRest;
+    }
+
+    public void setCtlRest(String ctlRest) {
+        this.ctlRest = ctlRest;
+    }
+
+    public String getEmpIn() {
+        return empIn;
+    }
+
+    public void setEmpIn(String empIn) {
+        this.empIn = empIn;
+    }
+
+    public Integer getTankQty() {
+        return tankQty;
+    }
+
+    public void setTankQty(Integer tankQty) {
+        this.tankQty = tankQty;
+    }
+
+    public Integer getTankQty1() {
+        return tankQty1;
+    }
+
+    public void setTankQty1(Integer tankQty1) {
+        this.tankQty1 = tankQty1;
+    }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
new file mode 100644
index 0000000..388c3e2
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -0,0 +1,299 @@
+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("asr_bas_devp")
+public class BasDevp implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 缂栧彿
+     */
+    @ApiModelProperty(value= "缂栧彿")
+    @TableId(value = "dev_no", type = IdType.INPUT)
+    @TableField("dev_no")
+    private Integer devNo;
+
+    /**
+     * 璁惧鎻忚堪
+     */
+    @ApiModelProperty(value= "璁惧鎻忚堪")
+    @TableField("dec_desc")
+    private String decDesc;
+
+    /**
+     * 澶囨敞
+     */
+    @ApiModelProperty(value= "澶囨敞")
+    @TableField("dev_mk")
+    private String devMk;
+
+    /**
+     * 鍙叆
+     */
+    @ApiModelProperty(value= "鍙叆")
+    @TableField("in_enable")
+    private String inEnable;
+
+    /**
+     * 鍙嚭
+     */
+    @ApiModelProperty(value= "鍙嚭")
+    @TableField("out_enable")
+    private String outEnable;
+
+    /**
+     * 鑷姩
+     */
+    @ApiModelProperty(value= "鑷姩")
+    private String autoing;
+
+    /**
+     * 鏈夌墿
+     */
+    @ApiModelProperty(value= "鏈夌墿")
+    private String loading;
+
+    /**
+     * 鑳藉叆
+     */
+    @ApiModelProperty(value= "鑳藉叆")
+    private String canining;
+
+    /**
+     * 鑳藉嚭
+     */
+    @ApiModelProperty(value= "鑳藉嚭")
+    private String canouting;
+
+    @ApiModelProperty(value= "")
+    private String fronting;
+
+    @ApiModelProperty(value= "")
+    private String rearing;
+
+    @ApiModelProperty(value= "")
+    private String uping;
+
+    @ApiModelProperty(value= "")
+    private String downing;
+
+    /**
+     * 闇�姹�1
+     */
+    @ApiModelProperty(value= "闇�姹�1")
+    private String inreq1;
+
+    /**
+     * 闇�姹�2
+     */
+    @ApiModelProperty(value= "闇�姹�2")
+    private String inreq2;
+
+    /**
+     * 宸ヤ綔鍙�
+     */
+    @ApiModelProperty(value= "宸ヤ綔鍙�")
+    @TableField("wrk_no")
+    private Integer wrkNo;
+
+    @ApiModelProperty(value= "")
+    @TableField("wrk_no1")
+    private Integer wrkNo1;
+
+    /**
+     * 瀹瑰櫒绫诲瀷
+     */
+    @ApiModelProperty(value= "瀹瑰櫒绫诲瀷")
+    @TableField("ctn_type")
+    private Integer ctnType;
+
+    /**
+     * 鏉″舰鐮�
+     */
+    @ApiModelProperty(value= "鏉″舰鐮�")
+    private String barcode;
+
+    @ApiModelProperty(value= "")
+    @TableField("in_qty")
+    private Integer inQty;
+
+    @ApiModelProperty(value= "")
+    private Integer row1;
+
+    @ApiModelProperty(value= "")
+    @TableField("io_time")
+    private Date ioTime;
+
+    @ApiModelProperty(value= "")
+    private String area;
+
+    @ApiModelProperty(value= "")
+    @TableField("in_ok")
+    private String inOk;
+
+    @ApiModelProperty(value= "")
+    @TableField("out_ok")
+    private String outOk;
+
+    @ApiModelProperty(value= "楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿")
+    @TableField("loc_type1")
+    private Short locType1;
+
+    @ApiModelProperty(value= "瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿")
+    @TableField("loc_type2")
+    private Short locType2;
+
+    @ApiModelProperty(value= "杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿")
+    @TableField("loc_type3")
+    private Short locType3;
+
+    /**
+     * 淇敼浜哄憳
+     */
+    @ApiModelProperty(value= "淇敼浜哄憳")
+    @TableField("modi_user")
+    private Long modiUser;
+
+    /**
+     * 淇敼鏃堕棿
+     */
+    @ApiModelProperty(value= "淇敼鏃堕棿")
+    @TableField("modi_time")
+    private Date modiTime;
+
+    /**
+     * 鍒涘缓鑰�
+     */
+    @ApiModelProperty(value= "鍒涘缓鑰�")
+    @TableField("appe_user")
+    private Long appeUser;
+
+    /**
+     * 娣诲姞鏃堕棿
+     */
+    @ApiModelProperty(value= "娣诲姞鏃堕棿")
+    @TableField("appe_time")
+    private Date appeTime;
+
+    @ApiModelProperty(value= "")
+    @TableField("std_qty")
+    private Double stdQty;
+
+    @ApiModelProperty(value= "")
+    @TableField("min_wt")
+    private Double minWt;
+
+    @ApiModelProperty(value= "")
+    @TableField("max_wt")
+    private Double maxWt;
+
+    /**
+     * 閲嶉噺
+     */
+    @ApiModelProperty(value= "閲嶉噺")
+    @TableField("gross_wt")
+    private Double grossWt;
+
+    @ApiModelProperty(value= "")
+    @TableField("cart_pos")
+    private Integer cartPos;
+
+
+    public String getIoTime$(){
+        if (Cools.isEmpty(this.ioTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
+    }
+
+    public String getLocType1$() {
+        if (null == this.locType1){ return null; }
+        switch (this.locType1){
+            case 0:
+                return "鏈煡";
+            case 1:
+                return "浣庡簱浣�";
+            case 2:
+                return "楂樺簱浣�";
+            default:
+                return String.valueOf(this.locType1);
+        }
+    }
+
+    public String getLocType2$() {
+        if (null == this.locType2){ return null; }
+        switch (this.locType2){
+            case 0:
+                return "鏈煡";
+            case 1:
+                return "绐勫簱浣�";
+            case 2:
+                return "瀹藉簱浣�";
+            default:
+                return String.valueOf(this.locType2);
+        }
+    }
+
+    public String getLocType3$() {
+        if (null == this.locType3){ return null; }
+        switch (this.locType3){
+            case 0:
+                return "鏈煡";
+            case 1:
+                return "杞诲簱浣�";
+            case 2:
+                return "閲嶅簱浣�";
+            default:
+                return String.valueOf(this.locType3);
+        }
+    }
+
+    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 String getModiTime$(){
+        if (Cools.isEmpty(this.modiTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
+    }
+
+    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 String getAppeTime$(){
+        if (Cools.isEmpty(this.appeTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
+    }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
new file mode 100644
index 0000000..cd931b9
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -0,0 +1,272 @@
+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("asr_loc_mast")
+public class LocMast implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 搴撲綅鍙�
+     */
+    @ApiModelProperty(value= "搴撲綅鍙�")
+    @TableId(value = "loc_no", type = IdType.INPUT)
+    @TableField("loc_no")
+    private String locNo;
+
+    /**
+     * 搴撲綅绫诲瀷
+     */
+    @ApiModelProperty(value= "搴撲綅绫诲瀷")
+    @TableField("whs_type")
+    private Long whsType;
+
+    @ApiModelProperty(value= "")
+    @TableField("plt_type")
+    private Integer pltType;
+
+    @ApiModelProperty(value= "")
+    @TableField("ctn_type")
+    private Integer ctnType;
+
+    @ApiModelProperty(value= "搴撲綅鐘舵��")
+    @TableField("loc_sts")
+    private String locSts;
+
+    @ApiModelProperty(value= "")
+    @TableField("sheet_no")
+    private String sheetNo;
+
+    /**
+     * 鍫嗗灈鏈哄彿(asr_bas_crnp)
+     */
+    @ApiModelProperty(value= "鍫嗗灈鏈哄彿")
+    @TableField("crn_no")
+    private Integer crnNo;
+
+    /**
+     * 鎺�
+     */
+    @ApiModelProperty(value= "鎺�")
+    private Integer row1;
+
+    /**
+     * 鍒�
+     */
+    @ApiModelProperty(value= "鍒�")
+    private Integer bay1;
+
+    /**
+     * 灞�
+     */
+    @ApiModelProperty(value= "灞�")
+    private Integer lev1;
+
+    /**
+     * 婊℃澘
+     */
+    @ApiModelProperty(value= "婊℃澘")
+    @TableField("full_plt")
+    private String fullPlt;
+
+    @ApiModelProperty(value= "")
+    @TableField("loc_type")
+    private String locType;
+
+    @ApiModelProperty(value= "楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿")
+    @TableField("loc_type1")
+    private Short locType1;
+
+    @ApiModelProperty(value= "瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿")
+    @TableField("loc_type2")
+    private Short locType2;
+
+    @ApiModelProperty(value= "杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿")
+    @TableField("loc_type3")
+    private Short locType3;
+
+    @ApiModelProperty(value= "")
+    @TableField("out_enable")
+    private String outEnable;
+
+    @ApiModelProperty(value= "")
+    @TableField("io_time")
+    private Date ioTime;
+
+    @ApiModelProperty(value= "")
+    @TableField("first_time")
+    private Date firstTime;
+
+    /**
+     * 淇敼浜哄憳
+     */
+    @ApiModelProperty(value= "淇敼浜哄憳")
+    @TableField("modi_user")
+    private Long modiUser;
+
+    /**
+     * 淇敼鏃堕棿
+     */
+    @ApiModelProperty(value= "淇敼鏃堕棿")
+    @TableField("modi_time")
+    private Date modiTime;
+
+    /**
+     * 鍒涘缓鑰�
+     */
+    @ApiModelProperty(value= "鍒涘缓鑰�")
+    @TableField("appe_user")
+    private Long appeUser;
+
+    /**
+     * 娣诲姞鏃堕棿
+     */
+    @ApiModelProperty(value= "娣诲姞鏃堕棿")
+    @TableField("appe_time")
+    private Date appeTime;
+
+    @ApiModelProperty(value= "")
+    @TableField("error_time")
+    private Date errorTime;
+
+    @ApiModelProperty(value= "")
+    @TableField("error_memo")
+    private String errorMemo;
+
+    @ApiModelProperty(value= "")
+    @TableField("ctn_kind")
+    private Integer ctnKind;
+
+    @ApiModelProperty(value= "")
+    @TableField("sc_weight")
+    private Double scWeight;
+
+    @ApiModelProperty(value= "")
+    @TableField("inv_wh")
+    private String invWh;
+
+    @ApiModelProperty(value= "")
+    private String mk;
+
+    @ApiModelProperty(value= "")
+    private String barcode;
+
+    @ApiModelProperty(value= "")
+    @TableField("Pdc_type")
+    private String PdcType;
+
+    @ApiModelProperty(value= "")
+    @TableField("ctn_no")
+    private String ctnNo;
+
+    public String getIoTime$(){
+        if (Cools.isEmpty(this.ioTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
+    }
+
+    public String getFirstTime$(){
+        if (Cools.isEmpty(this.firstTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.firstTime);
+    }
+
+    public String getLocType1$() {
+        if (null == this.locType1){ return null; }
+        switch (this.locType1){
+            case 0:
+                return "鏈煡";
+            case 1:
+                return "浣庡簱浣�";
+            case 2:
+                return "楂樺簱浣�";
+            default:
+                return String.valueOf(this.locType1);
+        }
+    }
+
+    public String getLocType2$() {
+        if (null == this.locType2){ return null; }
+        switch (this.locType2){
+            case 0:
+                return "鏈煡";
+            case 1:
+                return "绐勫簱浣�";
+            case 2:
+                return "瀹藉簱浣�";
+            default:
+                return String.valueOf(this.locType2);
+        }
+    }
+
+    public String getLocType3$() {
+        if (null == this.locType3){ return null; }
+        switch (this.locType3){
+            case 0:
+                return "鏈煡";
+            case 1:
+                return "杞诲簱浣�";
+            case 2:
+                return "閲嶅簱浣�";
+            default:
+                return String.valueOf(this.locType3);
+        }
+    }
+
+    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 String getModiTime$(){
+        if (Cools.isEmpty(this.modiTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
+    }
+
+    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 String getAppeTime$(){
+        if (Cools.isEmpty(this.appeTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
+    }
+
+    public String getErrorTime$(){
+        if (Cools.isEmpty(this.errorTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
+    }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
new file mode 100644
index 0000000..2f55604
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -0,0 +1,1014 @@
+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.asrs.service.*;
+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_wrk_mast")
+public class WrkMast implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 宸ヤ綔鍙�
+     */
+    @ApiModelProperty(value= "宸ヤ綔鍙�")
+    @TableId(value = "wrk_no", type = IdType.INPUT)
+    @TableField("wrk_no")
+    private Integer wrkNo;
+
+    @ApiModelProperty(value= "")
+    @TableField("inv_wh")
+    private String invWh;
+
+    @ApiModelProperty(value= "")
+    private Date ymd;
+
+    @ApiModelProperty(value= "")
+    private String mk;
+
+    @ApiModelProperty(value= "")
+    @TableField("whs_type")
+    private Integer whsType;
+
+    /**
+     * 宸ヤ綔鐘舵��
+     */
+    @ApiModelProperty(value= "宸ヤ綔鐘舵��")
+    @TableField("wrk_sts")
+    private Long wrkSts;
+
+    /**
+     * 鍏ュ嚭搴撶被鍨�
+     */
+    @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
+    @TableField("io_type")
+    private Integer ioType;
+
+    /**
+     * 鍫嗗灈鏈�
+     */
+    @ApiModelProperty(value= "鍫嗗灈鏈�")
+    @TableField("crn_no")
+    private Integer crnNo;
+
+    @ApiModelProperty(value= "")
+    @TableField("sheet_no")
+    private String sheetNo;
+
+    /**
+     * 浼樺厛绾�
+     */
+    @ApiModelProperty(value= "浼樺厛绾�")
+    @TableField("io_pri")
+    private Double ioPri;
+
+    @ApiModelProperty(value= "")
+    @TableField("wrk_date")
+    private Date wrkDate;
+
+    /**
+     * 鐩爣搴撲綅
+     */
+    @ApiModelProperty(value= "鐩爣搴撲綅")
+    @TableField("loc_no")
+    private String locNo;
+
+    /**
+     * 鐩爣绔�
+     */
+    @ApiModelProperty(value= "鐩爣绔�")
+    @TableField("sta_no")
+    private Integer staNo;
+
+    /**
+     * 婧愮珯
+     */
+    @ApiModelProperty(value= "婧愮珯")
+    @TableField("source_sta_no")
+    private Integer sourceStaNo;
+
+    /**
+     * 婧愬簱浣�
+     */
+    @ApiModelProperty(value= "婧愬簱浣�")
+    @TableField("source_loc_no")
+    private String sourceLocNo;
+
+    @ApiModelProperty(value= "")
+    @TableField("loc_sts")
+    private String locSts;
+
+    /**
+     * 鎷ｆ枡
+     */
+    @ApiModelProperty(value= "鎷ｆ枡")
+    private String picking;
+
+    @ApiModelProperty(value= "")
+    @TableField("link_mis")
+    private String linkMis;
+
+    @ApiModelProperty(value= "")
+    @TableField("online_yn")
+    private String onlineYn;
+
+    @ApiModelProperty(value= "")
+    @TableField("upd_mk")
+    private String updMk;
+
+    /**
+     * 閫�鍑�
+     */
+    @ApiModelProperty(value= "閫�鍑�")
+    @TableField("exit_mk")
+    private String exitMk;
+
+    @ApiModelProperty(value= "")
+    @TableField("plt_type")
+    private Integer pltType;
+
+    /**
+     * 绌烘澘
+     */
+    @ApiModelProperty(value= "绌烘澘")
+    @TableField("empty_mk")
+    private String emptyMk;
+
+    /**
+     * 宸ヤ綔鏃堕棿
+     */
+    @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
+    @TableField("io_time")
+    private Date ioTime;
+
+    @ApiModelProperty(value= "")
+    @TableField("ctn_type")
+    private Integer ctnType;
+
+    @ApiModelProperty(value= "")
+    private String packed;
+
+    @ApiModelProperty(value= "")
+    @TableField("ove_mk")
+    private String oveMk;
+
+    @ApiModelProperty(value= "")
+    @TableField("mtn_type")
+    private Double mtnType;
+
+    @ApiModelProperty(value= "")
+    @TableField("user_no")
+    private String userNo;
+
+    /**
+     * 鍫嗗灈鏈哄惎鍔ㄦ椂闂�
+     */
+    @ApiModelProperty(value= "鍫嗗灈鏈哄惎鍔ㄦ椂闂�")
+    @TableField("crn_str_time")
+    private Date crnStrTime;
+
+    /**
+     * 鍫嗗灈鏈哄仠姝㈡椂闂�
+     */
+    @ApiModelProperty(value= "鍫嗗灈鏈哄仠姝㈡椂闂�")
+    @TableField("crn_end_time")
+    private Date crnEndTime;
+
+    @ApiModelProperty(value= "")
+    @TableField("plc_str_time")
+    private Date plcStrTime;
+
+    @ApiModelProperty(value= "")
+    @TableField("crn_pos_time")
+    private Date crnPosTime;
+
+    @ApiModelProperty(value= "")
+    @TableField("load_time")
+    private Double loadTime;
+
+    @ApiModelProperty(value= "")
+    @TableField("exp_time")
+    private Double expTime;
+
+    @ApiModelProperty(value= "")
+    @TableField("ref_wrkno")
+    private Double refWrkno;
+
+    /**
+     * 鎷ｆ枡鏃堕棿
+     */
+    @ApiModelProperty(value= "鎷ｆ枡鏃堕棿")
+    @TableField("ref_iotime")
+    private Date refIotime;
+
+    /**
+     * 淇敼浜哄憳
+     */
+    @ApiModelProperty(value= "淇敼浜哄憳")
+    @TableField("modi_user")
+    private Long modiUser;
+
+    /**
+     * 淇敼鏃堕棿
+     */
+    @ApiModelProperty(value= "淇敼鏃堕棿")
+    @TableField("modi_time")
+    private Date modiTime;
+
+    /**
+     * 鍒涘缓鑰�
+     */
+    @ApiModelProperty(value= "鍒涘缓鑰�")
+    @TableField("appe_user")
+    private Long appeUser;
+
+    /**
+     * 娣诲姞鏃堕棿
+     */
+    @ApiModelProperty(value= "娣诲姞鏃堕棿")
+    @TableField("appe_time")
+    private Date appeTime;
+
+    @ApiModelProperty(value= "")
+    @TableField("pause_mk")
+    private String pauseMk;
+
+    @ApiModelProperty(value= "")
+    @TableField("error_time")
+    private Date errorTime;
+
+    @ApiModelProperty(value= "")
+    @TableField("error_memo")
+    private String errorMemo;
+
+    @ApiModelProperty(value= "")
+    @TableField("ctn_kind")
+    private Integer ctnKind;
+
+    @ApiModelProperty(value= "")
+    @TableField("manu_type")
+    private String manuType;
+
+    /**
+     * 澶囨敞
+     */
+    @ApiModelProperty(value= "澶囨敞")
+    private String memo;
+
+    @ApiModelProperty(value= "")
+    @TableField("sc_weight")
+    private Double scWeight;
+
+    @ApiModelProperty(value= "")
+    @TableField("log_mk")
+    private String logMk;
+
+    @ApiModelProperty(value= "")
+    @TableField("log_err_time")
+    private Date logErrTime;
+
+    @ApiModelProperty(value= "")
+    @TableField("log_err_memo")
+    private String logErrMemo;
+
+    /**
+     * 鏉＄爜
+     */
+    @ApiModelProperty(value= "鏉＄爜")
+    private String barcode;
+
+    @ApiModelProperty(value= "")
+    @TableField("Pdc_type")
+    private String PdcType;
+
+    @ApiModelProperty(value= "")
+    @TableField("ctn_no")
+    private String ctnNo;
+
+    /**
+     * 婊℃澘
+     */
+    @ApiModelProperty(value= "婊℃澘")
+    @TableField("full_plt")
+    private String fullPlt;
+
+    public WrkMast() {}
+
+    public WrkMast(String invWh,Date ymd,String mk,Integer whsType,Long wrkSts,Integer ioType,Integer crnNo,String sheetNo,Double ioPri,Date wrkDate,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String locSts,String picking,String linkMis,String onlineYn,String updMk,String exitMk,Integer pltType,String emptyMk,Date ioTime,Integer ctnType,String packed,String oveMk,Double mtnType,String userNo,Date crnStrTime,Date crnEndTime,Date plcStrTime,Date crnPosTime,Double loadTime,Double expTime,Double refWrkno,Date refIotime,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String pauseMk,Date errorTime,String errorMemo,Integer ctnKind,String manuType,String memo,Double scWeight,String logMk,Date logErrTime,String logErrMemo,String barcode,String PdcType,String ctnNo,String fullPlt) {
+        this.invWh = invWh;
+        this.ymd = ymd;
+        this.mk = mk;
+        this.whsType = whsType;
+        this.wrkSts = wrkSts;
+        this.ioType = ioType;
+        this.crnNo = crnNo;
+        this.sheetNo = sheetNo;
+        this.ioPri = ioPri;
+        this.wrkDate = wrkDate;
+        this.locNo = locNo;
+        this.staNo = staNo;
+        this.sourceStaNo = sourceStaNo;
+        this.sourceLocNo = sourceLocNo;
+        this.locSts = locSts;
+        this.picking = picking;
+        this.linkMis = linkMis;
+        this.onlineYn = onlineYn;
+        this.updMk = updMk;
+        this.exitMk = exitMk;
+        this.pltType = pltType;
+        this.emptyMk = emptyMk;
+        this.ioTime = ioTime;
+        this.ctnType = ctnType;
+        this.packed = packed;
+        this.oveMk = oveMk;
+        this.mtnType = mtnType;
+        this.userNo = userNo;
+        this.crnStrTime = crnStrTime;
+        this.crnEndTime = crnEndTime;
+        this.plcStrTime = plcStrTime;
+        this.crnPosTime = crnPosTime;
+        this.loadTime = loadTime;
+        this.expTime = expTime;
+        this.refWrkno = refWrkno;
+        this.refIotime = refIotime;
+        this.modiUser = modiUser;
+        this.modiTime = modiTime;
+        this.appeUser = appeUser;
+        this.appeTime = appeTime;
+        this.pauseMk = pauseMk;
+        this.errorTime = errorTime;
+        this.errorMemo = errorMemo;
+        this.ctnKind = ctnKind;
+        this.manuType = manuType;
+        this.memo = memo;
+        this.scWeight = scWeight;
+        this.logMk = logMk;
+        this.logErrTime = logErrTime;
+        this.logErrMemo = logErrMemo;
+        this.barcode = barcode;
+        this.PdcType = PdcType;
+        this.ctnNo = ctnNo;
+        this.fullPlt = fullPlt;
+    }
+
+//    WrkMast wrkMast = new WrkMast(
+//            null,    // 
+//            null,    // 
+//            null,    // 
+//            null,    // 
+//            null,    // 宸ヤ綔鐘舵��
+//            null,    // 鍏ュ嚭搴撶被鍨�
+//            null,    // 鍫嗗灈鏈�
+//            null,    // 
+//            null,    // 浼樺厛绾�
+//            null,    // 
+//            null,    // 鐩爣搴撲綅
+//            null,    // 鐩爣绔�
+//            null,    // 婧愮珯
+//            null,    // 婧愬簱浣�
+//            null,    // 
+//            null,    // 鎷ｆ枡
+//            null,    // 
+//            null,    // 
+//            null,    // 
+//            null,    // 閫�鍑�
+//            null,    // 
+//            null,    // 绌烘澘
+//            null,    // 宸ヤ綔鏃堕棿
+//            null,    // 
+//            null,    // 
+//            null,    // 
+//            null,    // 
+//            null,    // 
+//            null,    // 鍫嗗灈鏈哄惎鍔ㄦ椂闂�
+//            null,    // 鍫嗗灈鏈哄仠姝㈡椂闂�
+//            null,    // 
+//            null,    // 
+//            null,    // 
+//            null,    // 
+//            null,    // 
+//            null,    // 鎷ｆ枡鏃堕棿
+//            null,    // 淇敼浜哄憳
+//            null,    // 淇敼鏃堕棿
+//            null,    // 鍒涘缓鑰�
+//            null,    // 娣诲姞鏃堕棿
+//            null,    // 
+//            null,    // 
+//            null,    // 
+//            null,    // 
+//            null,    // 
+//            null,    // 澶囨敞
+//            null,    // 
+//            null,    // 
+//            null,    // 
+//            null,    // 
+//            null,    // 鏉＄爜
+//            null,    // 
+//            null,    // 
+//            null    // 婊℃澘
+//    );
+
+    public Integer getWrkNo() {
+        return wrkNo;
+    }
+
+    public void setWrkNo(Integer wrkNo) {
+        this.wrkNo = wrkNo;
+    }
+
+    public String getInvWh() {
+        return invWh;
+    }
+
+    public void setInvWh(String invWh) {
+        this.invWh = invWh;
+    }
+
+    public Date getYmd() {
+        return ymd;
+    }
+
+    public String getYmd$(){
+        if (Cools.isEmpty(this.ymd)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ymd);
+    }
+
+    public void setYmd(Date ymd) {
+        this.ymd = ymd;
+    }
+
+    public String getMk() {
+        return mk;
+    }
+
+    public void setMk(String mk) {
+        this.mk = mk;
+    }
+
+    public Integer getWhsType() {
+        return whsType;
+    }
+
+    public void setWhsType(Integer whsType) {
+        this.whsType = whsType;
+    }
+
+    public Long getWrkSts() {
+        return wrkSts;
+    }
+
+    public void setWrkSts(Long wrkSts) {
+        this.wrkSts = wrkSts;
+    }
+
+    public Integer getIoType() {
+        return ioType;
+    }
+
+    public void setIoType(Integer ioType) {
+        this.ioType = ioType;
+    }
+
+    public Integer getCrnNo() {
+        return crnNo;
+    }
+
+    public String getCrnNo$(){
+        BasCrnpService service = SpringUtils.getBean(BasCrnpService.class);
+        BasCrnp basCrnp = service.selectById(this.crnNo);
+        if (!Cools.isEmpty(basCrnp)){
+            return String.valueOf(basCrnp.getCrnNo());
+        }
+        return null;
+    }
+
+    public void setCrnNo(Integer crnNo) {
+        this.crnNo = crnNo;
+    }
+
+    public String getSheetNo() {
+        return sheetNo;
+    }
+
+    public void setSheetNo(String sheetNo) {
+        this.sheetNo = sheetNo;
+    }
+
+    public Double getIoPri() {
+        return ioPri;
+    }
+
+    public void setIoPri(Double ioPri) {
+        this.ioPri = ioPri;
+    }
+
+    public Date getWrkDate() {
+        return wrkDate;
+    }
+
+    public String getWrkDate$(){
+        if (Cools.isEmpty(this.wrkDate)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.wrkDate);
+    }
+
+    public void setWrkDate(Date wrkDate) {
+        this.wrkDate = wrkDate;
+    }
+
+    public String getLocNo() {
+        return locNo;
+    }
+
+    public String getLocNo$(){
+        LocMastService service = SpringUtils.getBean(LocMastService.class);
+        LocMast locMast = service.selectById(this.locNo);
+        if (!Cools.isEmpty(locMast)){
+            return String.valueOf(locMast.getLocNo());
+        }
+        return null;
+    }
+
+    public void setLocNo(String locNo) {
+        this.locNo = locNo;
+    }
+
+    public Integer getStaNo() {
+        return staNo;
+    }
+
+    public String getStaNo$(){
+        BasDevpService service = SpringUtils.getBean(BasDevpService.class);
+        BasDevp basDevp = service.selectById(this.staNo);
+        if (!Cools.isEmpty(basDevp)){
+            return String.valueOf(basDevp.getDevNo());
+        }
+        return null;
+    }
+
+    public void setStaNo(Integer staNo) {
+        this.staNo = staNo;
+    }
+
+    public Integer getSourceStaNo() {
+        return sourceStaNo;
+    }
+
+    public String getSourceStaNo$(){
+        BasDevpService service = SpringUtils.getBean(BasDevpService.class);
+        BasDevp basDevp = service.selectById(this.sourceStaNo);
+        if (!Cools.isEmpty(basDevp)){
+            return String.valueOf(basDevp.getDevNo());
+        }
+        return null;
+    }
+
+    public void setSourceStaNo(Integer sourceStaNo) {
+        this.sourceStaNo = sourceStaNo;
+    }
+
+    public String getSourceLocNo() {
+        return sourceLocNo;
+    }
+
+    public String getSourceLocNo$(){
+        LocMastService service = SpringUtils.getBean(LocMastService.class);
+        LocMast locMast = service.selectById(this.sourceLocNo);
+        if (!Cools.isEmpty(locMast)){
+            return String.valueOf(locMast.getLocNo());
+        }
+        return null;
+    }
+
+    public void setSourceLocNo(String sourceLocNo) {
+        this.sourceLocNo = sourceLocNo;
+    }
+
+    public String getLocSts() {
+        return locSts;
+    }
+
+    public void setLocSts(String locSts) {
+        this.locSts = locSts;
+    }
+
+    public String getPicking() {
+        return picking;
+    }
+
+    public void setPicking(String picking) {
+        this.picking = picking;
+    }
+
+    public String getLinkMis() {
+        return linkMis;
+    }
+
+    public void setLinkMis(String linkMis) {
+        this.linkMis = linkMis;
+    }
+
+    public String getOnlineYn() {
+        return onlineYn;
+    }
+
+    public void setOnlineYn(String onlineYn) {
+        this.onlineYn = onlineYn;
+    }
+
+    public String getUpdMk() {
+        return updMk;
+    }
+
+    public void setUpdMk(String updMk) {
+        this.updMk = updMk;
+    }
+
+    public String getExitMk() {
+        return exitMk;
+    }
+
+    public void setExitMk(String exitMk) {
+        this.exitMk = exitMk;
+    }
+
+    public Integer getPltType() {
+        return pltType;
+    }
+
+    public void setPltType(Integer pltType) {
+        this.pltType = pltType;
+    }
+
+    public String getEmptyMk() {
+        return emptyMk;
+    }
+
+    public void setEmptyMk(String emptyMk) {
+        this.emptyMk = emptyMk;
+    }
+
+    public Date getIoTime() {
+        return ioTime;
+    }
+
+    public String getIoTime$(){
+        if (Cools.isEmpty(this.ioTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
+    }
+
+    public void setIoTime(Date ioTime) {
+        this.ioTime = ioTime;
+    }
+
+    public Integer getCtnType() {
+        return ctnType;
+    }
+
+    public void setCtnType(Integer ctnType) {
+        this.ctnType = ctnType;
+    }
+
+    public String getPacked() {
+        return packed;
+    }
+
+    public void setPacked(String packed) {
+        this.packed = packed;
+    }
+
+    public String getOveMk() {
+        return oveMk;
+    }
+
+    public void setOveMk(String oveMk) {
+        this.oveMk = oveMk;
+    }
+
+    public Double getMtnType() {
+        return mtnType;
+    }
+
+    public void setMtnType(Double mtnType) {
+        this.mtnType = mtnType;
+    }
+
+    public String getUserNo() {
+        return userNo;
+    }
+
+    public void setUserNo(String userNo) {
+        this.userNo = userNo;
+    }
+
+    public Date getCrnStrTime() {
+        return crnStrTime;
+    }
+
+    public String getCrnStrTime$(){
+        if (Cools.isEmpty(this.crnStrTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.crnStrTime);
+    }
+
+    public void setCrnStrTime(Date crnStrTime) {
+        this.crnStrTime = crnStrTime;
+    }
+
+    public Date getCrnEndTime() {
+        return crnEndTime;
+    }
+
+    public String getCrnEndTime$(){
+        if (Cools.isEmpty(this.crnEndTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.crnEndTime);
+    }
+
+    public void setCrnEndTime(Date crnEndTime) {
+        this.crnEndTime = crnEndTime;
+    }
+
+    public Date getPlcStrTime() {
+        return plcStrTime;
+    }
+
+    public String getPlcStrTime$(){
+        if (Cools.isEmpty(this.plcStrTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.plcStrTime);
+    }
+
+    public void setPlcStrTime(Date plcStrTime) {
+        this.plcStrTime = plcStrTime;
+    }
+
+    public Date getCrnPosTime() {
+        return crnPosTime;
+    }
+
+    public String getCrnPosTime$(){
+        if (Cools.isEmpty(this.crnPosTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.crnPosTime);
+    }
+
+    public void setCrnPosTime(Date crnPosTime) {
+        this.crnPosTime = crnPosTime;
+    }
+
+    public Double getLoadTime() {
+        return loadTime;
+    }
+
+    public void setLoadTime(Double loadTime) {
+        this.loadTime = loadTime;
+    }
+
+    public Double getExpTime() {
+        return expTime;
+    }
+
+    public void setExpTime(Double expTime) {
+        this.expTime = expTime;
+    }
+
+    public Double getRefWrkno() {
+        return refWrkno;
+    }
+
+    public void setRefWrkno(Double refWrkno) {
+        this.refWrkno = refWrkno;
+    }
+
+    public Date getRefIotime() {
+        return refIotime;
+    }
+
+    public String getRefIotime$(){
+        if (Cools.isEmpty(this.refIotime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.refIotime);
+    }
+
+    public void setRefIotime(Date refIotime) {
+        this.refIotime = refIotime;
+    }
+
+    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 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 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;
+    }
+
+    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 String getPauseMk() {
+        return pauseMk;
+    }
+
+    public void setPauseMk(String pauseMk) {
+        this.pauseMk = pauseMk;
+    }
+
+    public Date getErrorTime() {
+        return errorTime;
+    }
+
+    public String getErrorTime$(){
+        if (Cools.isEmpty(this.errorTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
+    }
+
+    public void setErrorTime(Date errorTime) {
+        this.errorTime = errorTime;
+    }
+
+    public String getErrorMemo() {
+        return errorMemo;
+    }
+
+    public void setErrorMemo(String errorMemo) {
+        if (errorMemo.length() > 255) {
+            errorMemo = errorMemo.substring(0, 150);
+        }
+        this.errorMemo = errorMemo;
+    }
+
+    public Integer getCtnKind() {
+        return ctnKind;
+    }
+
+    public void setCtnKind(Integer ctnKind) {
+        this.ctnKind = ctnKind;
+    }
+
+    public String getManuType() {
+        return manuType;
+    }
+
+    public void setManuType(String manuType) {
+        this.manuType = manuType;
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo;
+    }
+
+    public Double getScWeight() {
+        return scWeight;
+    }
+
+    public void setScWeight(Double scWeight) {
+        this.scWeight = scWeight;
+    }
+
+    public String getLogMk() {
+        return logMk;
+    }
+
+    public void setLogMk(String logMk) {
+        this.logMk = logMk;
+    }
+
+    public Date getLogErrTime() {
+        return logErrTime;
+    }
+
+    public String getLogErrTime$(){
+        if (Cools.isEmpty(this.logErrTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime);
+    }
+
+    public void setLogErrTime(Date logErrTime) {
+        this.logErrTime = logErrTime;
+    }
+
+    public String getLogErrMemo() {
+        return logErrMemo;
+    }
+
+    public void setLogErrMemo(String logErrMemo) {
+        this.logErrMemo = logErrMemo;
+    }
+
+    public String getBarcode() {
+        return barcode;
+    }
+
+    public void setBarcode(String barcode) {
+        this.barcode = barcode;
+    }
+
+    public String getPdcType() {
+        return PdcType;
+    }
+
+    public void setPdcType(String PdcType) {
+        this.PdcType = PdcType;
+    }
+
+    public String getCtnNo() {
+        return ctnNo;
+    }
+
+    public void setCtnNo(String ctnNo) {
+        this.ctnNo = ctnNo;
+    }
+
+    public String getFullPlt() {
+        return fullPlt;
+    }
+
+    public void setFullPlt(String fullPlt) {
+        this.fullPlt = fullPlt;
+    }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/BasCrnpMapper.java b/src/main/java/com/zy/asrs/mapper/BasCrnpMapper.java
new file mode 100644
index 0000000..baffc35
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasCrnpMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.BasCrnp;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasCrnpMapper extends BaseMapper<BasCrnp> {
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java b/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
new file mode 100644
index 0000000..668d2ca
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
@@ -0,0 +1,18 @@
+package com.zy.asrs.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.BasDevp;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Mapper
+@Repository
+public interface BasDevpMapper extends BaseMapper<BasDevp> {
+
+    List<Integer> getAvailableInSite(@Param("typeNo") Integer typeNo);
+
+    List<Integer> getAvailableOutSite(@Param("typeNo") Integer typeNo);
+}
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
new file mode 100644
index 0000000..57c635b
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -0,0 +1,21 @@
+package com.zy.asrs.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.LocMast;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Mapper
+@Repository
+public interface LocMastMapper extends BaseMapper<LocMast> {
+
+    LocMast queryFreeLocMast(@Param("row") Integer row);
+
+    @Select("select loc_no from asr_loc_mast where 1=1 and loc_sts = 'O' and crn_no = #{crnNo}")
+    List<String> queryGroupEmptyStock(Integer crnNo);
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
new file mode 100644
index 0000000..dd349bd
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -0,0 +1,19 @@
+package com.zy.asrs.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.WrkMast;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Mapper
+@Repository
+public interface WrkMastMapper extends BaseMapper<WrkMast> {
+
+//    @Select("select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) and io_type <> 103 and io_type <> 104 and io_type <> 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no")
+    List<WrkMast> selectToBeCompleteData();
+
+    List<WrkMast> selectToBeHistoryData();
+
+}
diff --git a/src/main/java/com/zy/asrs/service/BasCrnpService.java b/src/main/java/com/zy/asrs/service/BasCrnpService.java
new file mode 100644
index 0000000..791f07f
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasCrnpService.java
@@ -0,0 +1,10 @@
+package com.zy.asrs.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.BasCrnp;
+
+public interface BasCrnpService extends IService<BasCrnp> {
+
+    BasCrnp checkSiteStatus(Integer crnId);
+
+}
diff --git a/src/main/java/com/zy/asrs/service/BasDevpService.java b/src/main/java/com/zy/asrs/service/BasDevpService.java
new file mode 100644
index 0000000..8628feb
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasDevpService.java
@@ -0,0 +1,47 @@
+package com.zy.asrs.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.BasDevp;
+
+import java.util.List;
+
+public interface BasDevpService extends IService<BasDevp> {
+
+    /**
+     * 鍏ュ簱绔�
+     * @return
+     */
+    List<Integer> getAvailableInSite();
+
+    /**
+     * 绌烘澘鍏ュ簱绔�
+     * @return
+     */
+    List<Integer> getAvailableEmptyInSite();
+
+    /**
+     * 鍑哄簱绔�
+     * @return
+     */
+    List<Integer> getAvailableOutSite(Integer typeNo);
+
+    /**
+     * 绌烘澘鍑哄簱绔�
+     * @return
+     */
+    List<Integer> getAvailableEmptyOutSite();
+
+    /**
+     * 鐩爣绔欑偣鐘舵�佹娴�
+     * @param devpNo
+     */
+    BasDevp checkSiteStatus(Integer devpNo);
+
+    /**
+     * 鐩爣绔欑偣鐘舵�佹娴�
+     * @param devpNo
+     * @param put 鏄惁鍏ュ簱鎿嶄綔 true 鏄� 锛� false 涓嶆槸
+     */
+    BasDevp checkSiteStatus(Integer devpNo, boolean put);
+
+}
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
new file mode 100644
index 0000000..95932ad
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -0,0 +1,21 @@
+package com.zy.asrs.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.LocMast;
+
+import java.util.List;
+
+public interface LocMastService extends IService<LocMast> {
+
+    /**
+     * 妫�绱㈠彲鐢ㄥ簱浣�
+     */
+    LocMast queryFreeLocMast(Integer row);
+
+    /**
+     * 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅
+     * @param sourceLocNo 婧愬簱浣�
+     * @return 鍚岀粍绌哄簱浣嶉泦鍚�
+     */
+    List<String> queryGroupEmptyStock(String sourceLocNo);
+}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastService.java b/src/main/java/com/zy/asrs/service/WrkMastService.java
new file mode 100644
index 0000000..f5c3e5c
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/WrkMastService.java
@@ -0,0 +1,16 @@
+package com.zy.asrs.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.WrkMast;
+
+import java.util.List;
+
+public interface WrkMastService extends IService<WrkMast> {
+
+    int getWorkingMast(Integer devpNo);
+
+    List<WrkMast> selectToBeCompleteData();
+
+    List<WrkMast> selectToBeHistoryData();
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
new file mode 100644
index 0000000..7a6bac4
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
@@ -0,0 +1,28 @@
+package com.zy.asrs.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.Cools;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.BasCrnp;
+import com.zy.asrs.mapper.BasCrnpMapper;
+import com.zy.asrs.service.BasCrnpService;
+import org.springframework.stereotype.Service;
+
+@Service("basCrnpService")
+public class BasCrnpServiceImpl extends ServiceImpl<BasCrnpMapper, BasCrnp> implements BasCrnpService {
+
+    @Override
+    public BasCrnp checkSiteStatus(Integer crnId) {
+        BasCrnp crnp = this.selectById(crnId);
+        if (Cools.isEmpty(crnp)) {
+            throw new CoolException(crnId + "鍙峰爢鍨涙満涓嶅瓨鍦�");
+        }
+        if ("N".equals(crnp.getInEnable())) {
+            throw new CoolException(crnId + "鍫嗗灈鏈轰笉鍙叆");
+        }
+        if ("N".equals(crnp.getOutEnable())) {
+            throw new CoolException(crnId + "鍫嗗灈鏈轰笉鍙嚭");
+        }
+        return crnp;
+    }
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
new file mode 100644
index 0000000..1f87a7d
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -0,0 +1,67 @@
+package com.zy.asrs.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.mapper.BasDevpMapper;
+import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.WrkMastService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("basDevpService")
+public class BasDevpServiceImpl extends ServiceImpl<BasDevpMapper, BasDevp> implements BasDevpService {
+
+    @Autowired
+    private WrkMastService wrkMastService;
+
+    @Override
+    public List<Integer> getAvailableInSite() {
+        return this.baseMapper.getAvailableInSite(1);
+    }
+
+    @Override
+    public List<Integer> getAvailableEmptyInSite() {
+        return this.baseMapper.getAvailableInSite(10);
+    }
+
+    @Override
+    public List<Integer> getAvailableOutSite(Integer typeNo) {
+        return this.baseMapper.getAvailableOutSite(typeNo);
+    }
+
+    @Override
+    public List<Integer> getAvailableEmptyOutSite() {
+        return this.baseMapper.getAvailableOutSite(110);
+    }
+
+    @Override
+    public BasDevp checkSiteStatus(Integer devpNo) {
+        return checkSiteStatus(devpNo, false);
+    }
+
+    @Override
+    public BasDevp checkSiteStatus(Integer devpNo, boolean put) {
+        BasDevp station = selectById(devpNo);
+        if (station == null){
+            throw new CoolException(devpNo+"绔欑偣涓嶅瓨鍦�");
+        }
+        if (put) {
+            if(station.getAutoing()==null || !station.getAutoing().equals("Y")) {
+                throw new CoolException(devpNo+"绔欑偣涓嶆槸鑷姩鐘舵��");
+            }
+            if(station.getLoading()==null || !station.getLoading().equals("Y")) {
+                throw new CoolException(devpNo+"绔欑偣鏃犵墿");
+            }
+            if(station.getWrkNo()!=null && station.getWrkNo()>0) {
+                throw new CoolException(devpNo+"绔欑偣宸叉湁宸ヤ綔鍙�");
+            }
+            if(wrkMastService.getWorkingMast(devpNo)>0){
+                throw new CoolException(devpNo+"绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�");
+            }
+        }
+        return station;
+    }
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
new file mode 100644
index 0000000..e1a01ea
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -0,0 +1,31 @@
+package com.zy.asrs.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.Cools;
+import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.mapper.LocMastMapper;
+import com.zy.asrs.service.LocMastService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("locMastService")
+public class LocMastServiceImpl extends ServiceImpl<LocMastMapper, LocMast> implements LocMastService {
+
+    @Override
+    public LocMast queryFreeLocMast(Integer row) {
+        return this.baseMapper.queryFreeLocMast(row);
+    }
+
+    @Override
+    public List<String> queryGroupEmptyStock(String sourceLocNo) {
+        if (Cools.isEmpty(sourceLocNo)) {
+            return null;
+        }
+        LocMast sourceStock = this.selectById(sourceLocNo);
+        if (Cools.isEmpty(sourceStock)) {
+            return null;
+        }
+        return this.baseMapper.queryGroupEmptyStock(sourceStock.getCrnNo());
+    }
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
new file mode 100644
index 0000000..63e7cd2
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -0,0 +1,30 @@
+package com.zy.asrs.service.impl;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.mapper.WrkMastMapper;
+import com.zy.asrs.service.WrkMastService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("wrkMastService")
+public class WrkMastServiceImpl extends ServiceImpl<WrkMastMapper, WrkMast> implements WrkMastService {
+
+    @Override
+    public int getWorkingMast(Integer devpNo) {
+        return selectCount(new EntityWrapper<WrkMast>().eq("source_sta_no", devpNo).in("wrk_sts", 1, 6));
+    }
+
+    @Override
+    public List<WrkMast> selectToBeCompleteData() {
+        return this.baseMapper.selectToBeCompleteData();
+    }
+
+    @Override
+    public List<WrkMast> selectToBeHistoryData() {
+        return this.baseMapper.selectToBeHistoryData();
+    }
+
+}
diff --git a/src/main/java/com/zy/common/Main.java b/src/main/java/com/zy/common/Main.java
index ab86c2f..8b72711 100644
--- a/src/main/java/com/zy/common/Main.java
+++ b/src/main/java/com/zy/common/Main.java
@@ -20,40 +20,59 @@
 
 public class Main {
 
-    public static void main(String[] args) throws InterruptedException {
-        SiemesTest();
-        try {
-            //Constructor[] aa = Integer.class.getDeclaredConstructors();
-            //int i = (Integer) (aa[1].newInstance("1"));
-            //System.out.println(Utilities.bytes2HexString( Utilities.getBytes(String.format("%04x",100),"ASCII")));
-            //System.out.println(i);
+//    public static void main(String[] args) throws InterruptedException {
+//        SiemesTest();
+//        try {
+//            //Constructor[] aa = Integer.class.getDeclaredConstructors();
+//            //int i = (Integer) (aa[1].newInstance("1"));
+//            //System.out.println(Utilities.bytes2HexString( Utilities.getBytes(String.format("%04x",100),"ASCII")));
+//            //System.out.println(i);
+//
+//            //System.out.println(Arrays.toString("123".split("\\." )));
+//            //ModbusTcpTets();
+//            //MelsecMcNet melsec_net = new MelsecMcNet("192.168.8.12", 6001);
+//            //System.out.println(melsec_net.ReadInt16("D100").Content);
+//
+//            SiemensS7Net siemensS7Net = new SiemensS7Net(SiemensPLCS.S1200,"192.168.8.12");
+//            OperateResult write = siemensS7Net.Write("M200",(short)200);
+//
+//            if(!write.IsSuccess){
+//                System.out.println("Write failed:"+write.Message);
+//            }
+//
+//            OperateResultExOne<Short> read = siemensS7Net.ReadInt16("M200");
+//            if(read.IsSuccess){
+//                System.out.println("Value:"+read.Content.toString());
+//            }
+//            else {
+//                System.out.println("Read failed:"+read.Message);
+//            }
+//        }
+//        catch (Exception ex){
+//            System.out.println(ex.getMessage());
+//        }
+//        Thread.sleep(1000);
+//    }
 
-            //System.out.println(Arrays.toString("123".split("\\." )));
-            //ModbusTcpTets();
-            //MelsecMcNet melsec_net = new MelsecMcNet("192.168.8.12", 6001);
-            //System.out.println(melsec_net.ReadInt16("D100").Content);
 
-            SiemensS7Net siemensS7Net = new SiemensS7Net(SiemensPLCS.S1200,"192.168.8.12");
-            OperateResult write = siemensS7Net.Write("M200",(short)200);
-
-            if(!write.IsSuccess){
-                System.out.println("Write failed:"+write.Message);
-            }
-
-            OperateResultExOne<Short> read = siemensS7Net.ReadInt16("M200");
-            if(read.IsSuccess){
-                System.out.println("Value:"+read.Content.toString());
-            }
-            else {
-                System.out.println("Read failed:"+read.Message);
-            }
+    public static void main(String[] args) {
+        MelsecMcNet melsec_net = new MelsecMcNet("192.168.2.6", 6000);
+        OperateResult operateResult = melsec_net.ConnectServer();
+        if (operateResult.IsSuccess) {
+            System.out.println("杩炴帴鎴愬姛");
+        } else {
+            System.err.println("杩炴帴澶辫触" + operateResult.Message);
         }
-        catch (Exception ex){
-            System.out.println(ex.getMessage());
+        OperateResult d100 = melsec_net.Write("D100", "H000C");
+        if (d100.IsSuccess) {
+            System.out.println("鍙戦�佹垚鍔�");
+        } else {
+
+
         }
-        Thread.sleep(1000);
+
+
     }
-
 
     /**
      * 绠�鍗曠綉缁滃鎴风
diff --git a/src/main/resources/mapper/BasCrnpMapper.xml b/src/main/resources/mapper/BasCrnpMapper.xml
new file mode 100644
index 0000000..b9a10bc
--- /dev/null
+++ b/src/main/resources/mapper/BasCrnpMapper.xml
@@ -0,0 +1,31 @@
+<?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.BasCrnpMapper">
+
+    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasCrnp">
+        <id column="crn_no" property="crnNo" />
+        <result column="in_enable" property="inEnable" />
+        <result column="out_enable" property="outEnable" />
+        <result column="crn_sts" property="crnSts" />
+        <result column="wrk_no" property="wrkNo" />
+        <result column="crn_err" property="crnErr" />
+        <result column="frm_locno" property="frmLocno" />
+        <result column="frm_sta" property="frmSta" />
+        <result column="to_sta" property="toSta" />
+        <result column="to_locno" property="toLocno" />
+        <result column="appe_user" property="appeUser" />
+        <result column="appe_time" property="appeTime" />
+        <result column="modi_user" property="modiUser" />
+        <result column="modi_time" property="modiTime" />
+        <result column="hp_mk" property="hpMk" />
+        <result column="retrieve_mk" property="retrieveMk" />
+        <result column="ctl_hp" property="ctlHp" />
+        <result column="ctl_rest" property="ctlRest" />
+        <result column="emp_in" property="empIn" />
+        <result column="tank_qty" property="tankQty" />
+        <result column="tank_qty1" property="tankQty1" />
+
+    </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/BasDevpMapper.xml b/src/main/resources/mapper/BasDevpMapper.xml
new file mode 100644
index 0000000..b00be22
--- /dev/null
+++ b/src/main/resources/mapper/BasDevpMapper.xml
@@ -0,0 +1,69 @@
+<?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.BasDevpMapper">
+
+    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasDevp">
+        <id column="dev_no" property="devNo" />
+        <result column="dec_desc" property="decDesc" />
+        <result column="dev_mk" property="devMk" />
+        <result column="in_enable" property="inEnable" />
+        <result column="out_enable" property="outEnable" />
+        <result column="autoing" property="autoing" />
+        <result column="loading" property="loading" />
+        <result column="canining" property="canining" />
+        <result column="canouting" property="canouting" />
+        <result column="fronting" property="fronting" />
+        <result column="rearing" property="rearing" />
+        <result column="uping" property="uping" />
+        <result column="downing" property="downing" />
+        <result column="inreq1" property="inreq1" />
+        <result column="inreq2" property="inreq2" />
+        <result column="wrk_no" property="wrkNo" />
+        <result column="wrk_no1" property="wrkNo1" />
+        <result column="ctn_type" property="ctnType" />
+        <result column="barcode" property="barcode" />
+        <result column="in_qty" property="inQty" />
+        <result column="row1" property="row1" />
+        <result column="io_time" property="ioTime" />
+        <result column="area" property="area" />
+        <result column="in_ok" property="inOk" />
+        <result column="out_ok" property="outOk" />
+        <result column="loc_type1" property="locType1" />
+        <result column="loc_type2" property="locType2" />
+        <result column="loc_type3" property="locType3" />
+        <result column="modi_user" property="modiUser" />
+        <result column="modi_time" property="modiTime" />
+        <result column="appe_user" property="appeUser" />
+        <result column="appe_time" property="appeTime" />
+        <result column="std_qty" property="stdQty" />
+        <result column="min_wt" property="minWt" />
+        <result column="max_wt" property="maxWt" />
+        <result column="gross_wt" property="grossWt" />
+        <result column="cart_pos" property="cartPos" />
+
+    </resultMap>
+
+    <select id="getAvailableInSite" resultType="java.lang.Integer">
+        select
+        abd.dev_no
+        from asr_bas_devp abd
+        left join asr_sta_desc asd on abd.dev_no = asd.stn_no
+        where 1=1
+        and asd.type_no = #{typeNo}
+        and abd.in_enable = 'Y'
+        group by abd.dev_no
+    </select>
+
+    <select id="getAvailableOutSite" resultType="java.lang.Integer">
+        select
+        abd.dev_no
+        from asr_bas_devp abd
+        left join asr_sta_desc asd on abd.dev_no = asd.stn_no
+        where 1=1
+        and asd.type_no = #{typeNo}
+        and abd.out_enable = 'Y'
+        group by abd.dev_no
+    </select>
+
+</mapper>
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
new file mode 100644
index 0000000..61d8a3a
--- /dev/null
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -0,0 +1,44 @@
+<?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.LocMastMapper">
+
+    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.LocMast">
+        <id column="loc_no" property="locNo" />
+        <result column="whs_type" property="whsType" />
+        <result column="plt_type" property="pltType" />
+        <result column="ctn_type" property="ctnType" />
+        <result column="loc_sts" property="locSts" />
+        <result column="sheet_no" property="sheetNo" />
+        <result column="crn_no" property="crnNo" />
+        <result column="row1" property="row1" />
+        <result column="bay1" property="bay1" />
+        <result column="lev1" property="lev1" />
+        <result column="full_plt" property="fullPlt" />
+        <result column="loc_type" property="locType" />
+        <result column="loc_type1" property="locType1" />
+        <result column="loc_type2" property="locType2" />
+        <result column="loc_type3" property="locType3" />
+        <result column="out_enable" property="outEnable" />
+        <result column="io_time" property="ioTime" />
+        <result column="first_time" property="firstTime" />
+        <result column="modi_user" property="modiUser" />
+        <result column="modi_time" property="modiTime" />
+        <result column="appe_user" property="appeUser" />
+        <result column="appe_time" property="appeTime" />
+        <result column="error_time" property="errorTime" />
+        <result column="error_memo" property="errorMemo" />
+        <result column="ctn_kind" property="ctnKind" />
+        <result column="sc_weight" property="scWeight" />
+        <result column="inv_wh" property="invWh" />
+        <result column="mk" property="mk" />
+        <result column="barcode" property="barcode" />
+        <result column="Pdc_type" property="PdcType" />
+        <result column="ctn_no" property="ctnNo" />
+
+    </resultMap>
+
+    <select id="queryFreeLocMast" resultMap="BaseResultMap">
+        select top 1 * from asr_loc_mast where row1=#{row} and loc_sts='O' order by loc_sts desc ,lev1 asc,bay1 asc
+    </select>
+</mapper>
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
new file mode 100644
index 0000000..ee48a59
--- /dev/null
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -0,0 +1,78 @@
+<?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.WrkMastMapper">
+
+    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMast">
+        <id column="wrk_no" property="wrkNo" />
+        <result column="inv_wh" property="invWh" />
+        <result column="ymd" property="ymd" />
+        <result column="mk" property="mk" />
+        <result column="whs_type" property="whsType" />
+        <result column="wrk_sts" property="wrkSts" />
+        <result column="io_type" property="ioType" />
+        <result column="crn_no" property="crnNo" />
+        <result column="sheet_no" property="sheetNo" />
+        <result column="io_pri" property="ioPri" />
+        <result column="wrk_date" property="wrkDate" />
+        <result column="loc_no" property="locNo" />
+        <result column="sta_no" property="staNo" />
+        <result column="source_sta_no" property="sourceStaNo" />
+        <result column="source_loc_no" property="sourceLocNo" />
+        <result column="loc_sts" property="locSts" />
+        <result column="picking" property="picking" />
+        <result column="link_mis" property="linkMis" />
+        <result column="online_yn" property="onlineYn" />
+        <result column="upd_mk" property="updMk" />
+        <result column="exit_mk" property="exitMk" />
+        <result column="plt_type" property="pltType" />
+        <result column="empty_mk" property="emptyMk" />
+        <result column="io_time" property="ioTime" />
+        <result column="ctn_type" property="ctnType" />
+        <result column="packed" property="packed" />
+        <result column="ove_mk" property="oveMk" />
+        <result column="mtn_type" property="mtnType" />
+        <result column="user_no" property="userNo" />
+        <result column="crn_str_time" property="crnStrTime" />
+        <result column="crn_end_time" property="crnEndTime" />
+        <result column="plc_str_time" property="plcStrTime" />
+        <result column="crn_pos_time" property="crnPosTime" />
+        <result column="load_time" property="loadTime" />
+        <result column="exp_time" property="expTime" />
+        <result column="ref_wrkno" property="refWrkno" />
+        <result column="ref_iotime" property="refIotime" />
+        <result column="modi_user" property="modiUser" />
+        <result column="modi_time" property="modiTime" />
+        <result column="appe_user" property="appeUser" />
+        <result column="appe_time" property="appeTime" />
+        <result column="pause_mk" property="pauseMk" />
+        <result column="error_time" property="errorTime" />
+        <result column="error_memo" property="errorMemo" />
+        <result column="ctn_kind" property="ctnKind" />
+        <result column="manu_type" property="manuType" />
+        <result column="memo" property="memo" />
+        <result column="sc_weight" property="scWeight" />
+        <result column="log_mk" property="logMk" />
+        <result column="log_err_time" property="logErrTime" />
+        <result column="log_err_memo" property="logErrMemo" />
+        <result column="barcode" property="barcode" />
+        <result column="Pdc_type" property="PdcType" />
+        <result column="ctn_no" property="ctnNo" />
+        <result column="full_plt" property="fullPlt" />
+
+    </resultMap>
+
+    <select id="selectToBeCompleteData" resultMap="BaseResultMap">
+        select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) and io_type != 103 and io_type != 104 and io_type != 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no
+    </select>
+
+    <select id="selectToBeHistoryData" resultMap="BaseResultMap">
+        select * from asr_wrk_mast
+        where wrk_sts=5
+        or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
+        or (wrk_sts=15 and dateadd(mi,15,crn_end_time) &lt;= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
+        or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
+        order by io_time,wrk_no asc
+    </select>
+
+</mapper>

--
Gitblit v1.9.1