From 2722343bfb3528b96c0c41860eb37079a073d2c5 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 10 九月 2024 09:43:11 +0800
Subject: [PATCH] #fs
---
src/main/java/com/zy/asrs/controller/RgvController.java | 8
src/main/java/com/zy/asrs/task/escalationParam/ScaleEscalationParam.java | 6
src/main/java/com/zy/asrs/controller/MonitorController.java | 3
src/main/java/com/zy/asrs/entity/WrkMast.java | 18 -
src/main/java/com/zy/asrs/task/escalationParam/StaEscalationParam.java | 6
src/main/java/com/zy/common/service/WmsService.java | 28 --
src/main/java/com/zy/core/ServerBootstrap.java | 2
src/main/java/com/zy/common/model/MatDto.java | 19 -
src/main/java/com/zy/core/properties/SlaveProperties.java | 4
/dev/null | 651 --------------------------------------------------
src/main/java/com/zy/asrs/controller/ConsoleController.java | 5
src/main/webapp/views/index.html | 5
src/main/java/com/zy/common/service/CommonService.java | 24 -
13 files changed, 0 insertions(+), 779 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 3aef99c..193a110 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -12,7 +12,6 @@
import com.zy.asrs.domain.vo.*;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.CodeRes;
@@ -48,8 +47,6 @@
private WrkMastService wrkMastService;
@Autowired
private BasDevpService basDevpService;
- @Autowired
- private LocMastMapper locMastMapper;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -183,8 +180,6 @@
vo.setIoType(wrkMast.getIoType$()); // 鍏ュ嚭搴撶被鍨�
vo.setSourceStaNo(wrkMast.getSourceStaNo$());
vo.setStaNo(wrkMast.getStaNo$());
- vo.setSourceLocNo(wrkMast.getSourceLocNo$());
- vo.setLocNo(wrkMast.getLocNo$());
}
}
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 97ad91a..8a3dc90 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -308,9 +308,6 @@
Double xDuration = 0.0D;
Double yDuration = 0.0D;
-
-// ledContent = "ask鐨勬ā鍧楄惃婊″ぇ绠椾簡钀ㄦ弧澶т簡\n 鏄獦澧冨埌鍩冨強鍡插鍡瞈n 钀ㄨ揪濮嗘墦寮�钀ㄦ弧澶у嚡鎾掗害褰撳姵钀ㄦ弧澶ц�佸笀";
-
return R.ok(
Cools.add("xSpeed", Arith.multiplys(1, Math.abs(xSpeed), 1)) // 琛岃蛋閫熷害
.add("ySpeed", Arith.multiplys(1, Math.abs(ySpeed), 1)) // 鍗囬檷閫熷害
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index c33b833..1a2b995 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
-import com.core.common.Arith;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.RgvStatusType;
@@ -11,11 +10,8 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.BasRgvErrMapper;
import com.zy.asrs.service.BasRgvService;
-import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.service.impl.MainServiceImpl;
-import com.zy.asrs.utils.VersionUtils;
-import com.zy.core.Slave;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
@@ -28,10 +24,8 @@
import com.zy.core.model.protocol.RgvProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.RgvThread;
-import com.zy.core.thread.ScaleThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -60,8 +54,6 @@
private BasRgvService basRgvService;
@Autowired
private MainServiceImpl mainService;
- @Autowired
- private LocMastService locMastService;
@PostMapping("/table/rgv/state")
@ManagerAuth(memo = "RGV淇℃伅琛�")
diff --git a/src/main/java/com/zy/asrs/entity/BasJar.java b/src/main/java/com/zy/asrs/entity/BasJar.java
deleted file mode 100644
index e4a5fb9..0000000
--- a/src/main/java/com/zy/asrs/entity/BasJar.java
+++ /dev/null
@@ -1,208 +0,0 @@
-package com.zy.asrs.entity;
-
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableField;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@Data
-@TableName("asr_bas_jar")
-public class BasJar implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * JAR缂栧彿
- */
- @ApiModelProperty(value= "JAR缂栧彿")
- @TableId(value = "jar_no", type = IdType.INPUT)
- @TableField("jar_no")
- private Integer jarNo;
-
- /**
- * 鍖哄煙
- */
- @ApiModelProperty(value= "鍖哄煙")
- private Integer region;
-
- /**
- * 浠ｅ彿
- */
- @ApiModelProperty(value= "浠ｅ彿")
- @TableField("jar_code")
- private Integer jarCode;
-
- /**
- * 瀵瑰簲鍑哄簱绔�
- */
- @ApiModelProperty(value= "瀵瑰簲鍑哄簱绔�")
- @TableField("sta_no")
- private Integer staNo;
-
- /**
- * 鐘舵��
- */
- @ApiModelProperty(value= "鐘舵��")
- @TableField("jar_status")
- private Integer jarStatus;
-
- /**
- * 搴撳瓨鏁�
- */
- @ApiModelProperty(value= "搴撳瓨鏁�")
- @TableField("jar_count")
- private Integer jarCount;
-
- /**
- * 寮傚父浠ｇ爜
- */
- @ApiModelProperty(value= "寮傚父浠ｇ爜")
- @TableField("jar_err")
- private Integer jarErr;
-
- /**
- * 宸﹂棬(checkBox)
- */
- @ApiModelProperty(value= "宸﹂棬(checkBox)")
- @TableField("left_door")
- private String leftDoor;
-
- /**
- * 鍙抽棬(checkBox)
- */
- @ApiModelProperty(value= "鍙抽棬(checkBox)")
- @TableField("right_door")
- private String rightDoor;
-
- /**
- * 宸﹂棬鍙紑(checkBox)
- */
- @ApiModelProperty(value= "宸﹂棬鍙紑(checkBox)")
- @TableField("left_in_enable")
- private String leftInEnable;
-
- /**
- * 宸﹂棬鍙叧(checkBox)
- */
- @ApiModelProperty(value= "宸﹂棬鍙叧(checkBox)")
- @TableField("left_out_enable")
- private String leftOutEnable;
-
- /**
- * 鑷姩(checkBox)
- */
- @ApiModelProperty(value= "鑷姩(checkBox)")
- private String autoing;
-
- /**
- * 妯″紡
- */
- @ApiModelProperty(value= "妯″紡")
- @TableField("jar_mode")
- private Integer jarMode;
-
- /**
- * 鍙抽棬鍙紑(checkBox)
- */
- @ApiModelProperty(value= "鍙抽棬鍙紑(checkBox)")
- @TableField("right_in_enable")
- private String rightInEnable;
-
- /**
- * 鍙抽棬鍙叧(checkBox)
- */
- @ApiModelProperty(value= "鍙抽棬鍙叧(checkBox)")
- @TableField("right_out_enable")
- private String rightOutEnable;
-
- /**
- * 鍏ョ綈灏忚溅
- */
- @ApiModelProperty(value= "鍏ョ綈灏忚溅")
- @TableField("enter_ste_no")
- private Integer enterSteNo;
-
- /**
- * 鍑虹綈灏忚溅
- */
- @ApiModelProperty(value= "鍑虹綈灏忚溅")
- @TableField("out_ste_no")
- private Integer outSteNo;
-
- /**
- * 鍏ョ綈RGV
- */
- @ApiModelProperty(value= "鍏ョ綈RGV")
- @TableField("enter_rgv_no")
- private Integer enterRgvNo;
-
- /**
- * 鍑虹綈RGV
- */
- @ApiModelProperty(value= "鍑虹綈RGV")
- @TableField("out_rgv_no")
- private Integer outRgvNo;
-
- /**
- * 鍐峰嵈
- */
- @ApiModelProperty(value= "鍐峰嵈")
- private Integer burial;
-
- public BasJar() {}
-
- public BasJar(Integer jarNo,Integer region,Integer jarCode,Integer staNo,Integer jarStatus,Integer jarCount,Integer jarErr,String leftDoor,String rightDoor,String leftInEnable,String leftOutEnable,String autoing,Integer jarMode,String rightInEnable,String rightOutEnable) {
- this.jarNo = jarNo;
- this.region = region;
- this.jarCode = jarCode;
- this.staNo = staNo;
- this.jarStatus = jarStatus;
- this.jarCount = jarCount;
- this.jarErr = jarErr;
- this.leftDoor = leftDoor;
- this.rightDoor = rightDoor;
- this.leftInEnable = leftInEnable;
- this.leftOutEnable = leftOutEnable;
- this.autoing = autoing;
- this.jarMode = jarMode;
- this.rightInEnable = rightInEnable;
- this.rightOutEnable = rightOutEnable;
- }
-
-// BasJar basJar = new BasJar(
-// null, // JAR缂栧彿[闈炵┖]
-// null, // 鍖哄煙
-// null, // 浠ｅ彿
-// null, // 瀵瑰簲鍑哄簱绔�
-// null, // 鐘舵��
-// null, // 搴撳瓨鏁�
-// null, // 寮傚父浠ｇ爜
-// null, // 宸﹂棬(checkBox)
-// null, // 鍙抽棬(checkBox)
-// null, // 宸﹂棬鍙紑(checkBox)
-// null, // 宸﹂棬鍙叧(checkBox)
-// null, // 鑷姩(checkBox)
-// null, // 妯″紡
-// null, // 鍙抽棬鍙紑(checkBox)
-// null // 鍙抽棬鍙叧(checkBox)
-// );
-
- public Integer getEntStaNo$(){
- if (this.jarNo==1){
- return 612;
- } else if (this.jarNo==2){
- return 615;
- } else if (this.jarNo==3){
- return 619;
- } else if (this.jarNo==4){
- return 622;
- } else {
- return 0;
- }
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/BasJarMast.java b/src/main/java/com/zy/asrs/entity/BasJarMast.java
deleted file mode 100644
index 715cd58..0000000
--- a/src/main/java/com/zy/asrs/entity/BasJarMast.java
+++ /dev/null
@@ -1,338 +0,0 @@
-package com.zy.asrs.entity;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.core.common.SpringUtils;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@Data
-@TableName("asr_bas_jar_mast")
-public class BasJarMast implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 宸ヤ綔鍙�
- */
- @ApiModelProperty(value= "宸ヤ綔鍙�")
- @TableField("wrk_no")
- private Long wrkNo;
-
- /**
- * 鍏ュ簱婧愮珯鐐�
- */
- @ApiModelProperty(value= "鍏ュ簱婧愮珯鐐�")
- @TableField("enter_sta_no")
- private Integer enterStaNo;
-
- /**
- * 鍏ュ簱鐩爣绔欑偣
- */
- @ApiModelProperty(value= "鍏ュ簱鐩爣绔欑偣")
- @TableField("out_sta_no")
- private Integer outStaNo;
-
- /**
- * 鍏ョ～鍖栫綈绔欑偣
- */
- @ApiModelProperty(value= "鍏ョ～鍖栫綈绔欑偣")
- @TableField("jar_enter_sta_no")
- private Integer jarEnterStaNo;
-
- /**
- * 鍑虹～鍖栫綈绔欑偣
- */
- @ApiModelProperty(value= "鍑虹～鍖栫綈绔欑偣")
- @TableField("jar_out_sta_no")
- private Integer jarOutStaNo;
-
- /**
- * 纭寲缃怚D
- */
- @ApiModelProperty(value= "纭寲缃怚D")
- @TableField("jar_id")
- private Integer jarId;
-
- /**
- * 鍖哄煙
- */
- @ApiModelProperty(value= "鍖哄煙")
- @TableField("jar_regin")
- private Integer jarRegin;
-
- /**
- * 宸ヤ綔鐘舵��
- */
- @ApiModelProperty(value= "宸ヤ綔鐘舵��")
- private Integer status;
-
- /**
- * 鍏ョ綈灏忚溅
- */
- @ApiModelProperty(value= "鍏ョ綈灏忚溅")
- @TableField("enter_ste_no")
- private Integer enterSteNo;
-
- /**
- * 鍑虹綈灏忚溅
- */
- @ApiModelProperty(value= "鍑虹綈灏忚溅")
- @TableField("out_ste_id")
- private Integer outSteId;
-
- /**
- * 鍏ョ綈RGV
- */
- @ApiModelProperty(value= "鍏ョ綈RGV")
- @TableField("enter_rgv_id")
- private Integer enterRgvId;
-
- /**
- * 鍑虹綈RGV
- */
- @ApiModelProperty(value= "鍑虹綈RGV")
- @TableField("out_rgv_id")
- private Integer outRgvId;
-
- /**
- * 鍏ュ簱鏃堕棿
- */
- @ApiModelProperty(value= "鍏ュ簱鏃堕棿")
- @TableField("io_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date ioTime;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @ApiModelProperty(value= "鍒涘缓鏃堕棿")
- @TableField("modi_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
-
- /**
- * 鏇存柊鏃堕棿
- */
- @ApiModelProperty(value= "鏇存柊鏃堕棿")
- @TableField("appe_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
-
- /**
- * 搴撲綅鍙�
- */
- @ApiModelProperty(value= "搴撲綅鍙�")
- @TableField("jar_loc_digit")
- private Integer jarLocDigit;
-
- /**
- * 鍐峰嵈
- */
- @ApiModelProperty(value= "鍐峰嵈")
- private Integer burial;
-
- public BasJarMast() {}
-
- public BasJarMast(Long wrkNo,Integer enterStaNo,Integer outStaNo,Integer jarEnterStaNo,Integer jarOutStaNo,Integer jarId,Integer jarRegin,Integer status,Integer enterSteNo,Integer outSteId,Integer enterRgvId,Integer outRgvId,Date ioTime,Date modiTime,Date appeTime,Integer jarLocDigit,Integer burial) {
- this.wrkNo = wrkNo;
- this.enterStaNo = enterStaNo;
- this.outStaNo = outStaNo;
- this.jarEnterStaNo = jarEnterStaNo;
- this.jarOutStaNo = jarOutStaNo;
- this.jarId = jarId;
- this.jarRegin = jarRegin;
- this.status = status;
- this.enterSteNo = enterSteNo;
- this.outSteId = outSteId;
- this.enterRgvId = enterRgvId;
- this.outRgvId = outRgvId;
- this.ioTime = ioTime;
- this.modiTime = modiTime;
- this.appeTime = appeTime;
- this.jarLocDigit = jarLocDigit;
- this.burial = burial;
- }
-
- public BasJarMast(BasJar jar,WrkMast wrkMast,Integer jarLocDigit) {
- Date now = new Date();
- this.wrkNo = wrkMast.getWrkNo().longValue();
- this.enterStaNo = wrkMast.getSourceStaNo();
- this.outStaNo = wrkMast.getStaNo();
-// this.jarEnterStaNo = jarEnterStaNo;
- this.jarOutStaNo = jar.getStaNo();
- this.jarId = jar.getJarNo();
- this.jarRegin = jar.getRegion();
- this.status = 0;
- this.enterSteNo = jar.getEnterSteNo();
- this.outSteId = jar.getOutSteNo();
- this.enterRgvId = jar.getEnterRgvNo();;
- this.outRgvId = jar.getOutRgvNo();;
- this.ioTime = wrkMast.getIoTime();
- this.modiTime = now;
- this.appeTime = now;
- this.jarLocDigit = jarLocDigit;
- this.burial = jar.getBurial();
- }
-
- public BasJarMast(BasJar jar) {
- Date now = new Date();
-// this.jarEnterStaNo = jarEnterStaNo;
- this.jarOutStaNo = jar.getStaNo();
- this.jarId = jar.getJarNo();
- this.jarRegin = jar.getRegion();
- this.status = 0;
- this.enterSteNo = jar.getEnterSteNo();
- this.outSteId = jar.getOutSteNo();
- this.enterRgvId = jar.getEnterRgvNo();;
- this.outRgvId = jar.getOutRgvNo();;
- this.ioTime = now;
- this.modiTime = now;
- this.appeTime = now;
- this.jarLocDigit = jarLocDigit;
- this.burial = jar.getBurial();
- }
-
-
-// BasJarMast basJarMast = new BasJarMast(
-// null, // 宸ヤ綔鍙穂闈炵┖]
-// null, // 鍏ュ簱婧愮珯鐐筟闈炵┖]
-// null, // 鍏ュ簱鐩爣绔欑偣[闈炵┖]
-// null, // 鍏ョ～鍖栫綈绔欑偣[闈炵┖]
-// null, // 鍑虹～鍖栫綈绔欑偣[闈炵┖]
-// null, // 纭寲缃怚D[闈炵┖]
-// null, // 鍖哄煙[闈炵┖]
-// null, // 宸ヤ綔鐘舵�乕闈炵┖]
-// null, // 鍏ョ綈灏忚溅[闈炵┖]
-// null, // 鍑虹綈灏忚溅[闈炵┖]
-// null, // 鍏ョ綈RGV[闈炵┖]
-// null, // 鍑虹綈RGV[闈炵┖]
-// null, // 鍏ュ簱鏃堕棿
-// null, // 鍒涘缓鏃堕棿
-// null // 鏇存柊鏃堕棿
-// );
-
-// public String getStatus$(){
-// BasJarMastStatusService service = SpringUtils.getBean(BasJarMastStatusService.class);
-// BasJarMastStatus basJarMastStatus = service.selectById(this.status);
-// if (!Cools.isEmpty(basJarMastStatus)){
-// return String.valueOf(basJarMastStatus.getId());
-// }
-// return null;
-
- /*
- default:
- statusList.add(17);//瀹屾垚 杈撻�佺嚎瀛樺湪宸ヤ綔鍙枫��===銆嬭浆鍘嗗彶妗ｆ
- case 7://鍑哄喎鍗存Ы浠诲姟
- case 6://灏忚溅绉诲姩鑷冲喎鍗存Ы浠诲姟
- case 5://寮�鍑烘枡闂ㄤ换鍔�
- statusList.add(10);//鍏ュ喎鍗存Ы瀹屾垚
- case 4://鍑虹～鍖栫綈浠诲姟
- statusList.add(11);//鍐峰嵈涓�
-
- if (type!=6){
- statusList.add(12);//鍐峰嵈瀹屾垚
- }
- statusList.add(13);//鍐峰嵈瀹屾垚璋冨皬杞︿换鍔�
-
- case 3://鍏宠繘鏂欓棬浠诲姟 //鐢熸垚鍒濆浠诲姟
- statusList.add(4);//鍏ョ～鍖栫綈瀹屾垚
-
- case 2://鍏宠繘鏂欓棬浠诲姟 //鐢熸垚鍒濆浠诲姟
- statusList.add(0);//鍒濆
-
- case 1://寮�杩涙枡闂ㄤ换鍔�
- statusList.add(2);//杩涙枡闂ㄦ墦寮�
-
- case 0://鍏ョ～鍖栫綈浠诲姟
- statusList.add(1);//寮�杩涙枡闂ㄤ腑
- statusList.add(3);//鍏ョ～鍖栫綈涓�
-
- statusList.add(5);//纭寲涓��===銆嬪叧闂ㄥ畬鎴�
-
- if (type!=5){
- statusList.add(6);//纭寲瀹屾垚
- }
-
- statusList.add(7);//寮�鍑烘枡闂ㄤ腑
-
- if (type!=4){
- statusList.add(8);//鍑烘枡闂ㄦ墦寮�
- }
-
- statusList.add(9);//鍑虹～鍖栫綈涓��===銆嬪叆鍐峰嵈妲戒腑
-
- statusList.add(15);//鍑哄喎鍗存Ы涓�
- statusList.add(16);//鍑哄喎鍗存Ы瀹屾垚
- if (type!=7){
- statusList.add(14);//灏忚溅鍒拌揪鍐峰嵈妲�
- }
- * */
-// }
-
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
- }
-
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- public Integer getStatusComplete(){
- return this.status+1;
- }
-
- /**
- * ioType浠诲姟绫诲瀷
- * 0: 鏈煡 1: 寮�杩涙枡闂� 2: 鍏宠繘鏂欓棬 3: 寮�鍑烘枡闂� 4: 鍏冲嚭鏂欓棬 5: 鍏ョ～鍖栫綈 6: 鍏ュ喎鍗存Ы
- * 7: 绌挎杞﹁繘鍐峰嵈妲� B=>C 8: 绌挎杞︾寮�鍐峰嵈妲� C=>B 9: 鍑哄喎鍗存Ы 10锛欰=>B 11:B=>A
- */
- public Integer getStatusComplete(Integer ioType){
- switch (ioType){
- case 1:
- return 2;
- case 3:
- return 8;
- case 2:
- return 5;
- case 5:
- return 4;
- case 6:
- return 10;
- case 9:
- return 17;
- }
- return this.status+1;
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/BasJarMastStatus.java b/src/main/java/com/zy/asrs/entity/BasJarMastStatus.java
deleted file mode 100644
index 9ab421c..0000000
--- a/src/main/java/com/zy/asrs/entity/BasJarMastStatus.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.zy.asrs.entity;
-
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@Data
-@TableName("asr_bas_jar_mast_status")
-public class BasJarMastStatus implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 浠诲姟鍙�
- */
- @ApiModelProperty(value= "浠诲姟鍙�")
- @TableField("box_specs")
- private String boxSpecs;
-
- /**
- * 鍫嗗灈鏈�
- */
- @ApiModelProperty(value= "鍫嗗灈鏈�")
- @TableField("box_type")
- private String boxType;
-
- public BasJarMastStatus() {}
-
- public BasJarMastStatus(String boxSpecs,String boxType) {
- this.boxSpecs = boxSpecs;
- this.boxType = boxType;
- }
-
-// BasJarMastStatus basJarMastStatus = new BasJarMastStatus(
-// null, // 浠诲姟鍙穂闈炵┖]
-// null // 鍫嗗灈鏈�
-// );
-
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
deleted file mode 100644
index 87c44d8..0000000
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ /dev/null
@@ -1,249 +0,0 @@
-package com.zy.asrs.entity;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.core.common.Cools;
-import com.core.common.SpringUtils;
-import com.zy.asrs.service.LocMastService;
-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_detl")
-public class LocDetl implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value= "搴撲綅鍙�")
- @TableField("loc_no")
- private String locNo;
-
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
- private String zpallet;
-
- @ApiModelProperty(value= "鏁伴噺")
- @ExcelProperty("鏁伴噺")
- private Double anfme;
-
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
- @ExcelProperty("鍟嗗搧缂栧彿")
- private String matnr;
-
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
- @ExcelProperty("鍟嗗搧鍚嶇О")
- private String maktx;
-
- @ApiModelProperty(value= "鎵瑰彿")
- @ExcelProperty("鎵瑰彿")
- private String batch;
-
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
- @ExcelProperty("鍗曟嵁缂栧彿")
- @TableField("order_no")
- private String orderNo;
-
- @ApiModelProperty(value= "瑙勬牸")
- private String specs;
-
- @ApiModelProperty(value= "鍨嬪彿")
- private String model;
-
- @ApiModelProperty(value= "棰滆壊")
- private String color;
-
- @ApiModelProperty(value= "鍝佺墝")
- private String brand;
-
- @ApiModelProperty(value= "鍗曚綅")
- private String unit;
-
- @ApiModelProperty(value= "鍗曚环")
- private Double price;
-
- @ApiModelProperty(value= "sku")
- private String sku;
-
- @ApiModelProperty(value= "鍗曚綅閲�")
- private Double units;
-
- @ApiModelProperty(value= "鏉＄爜")
- private String barcode;
-
- @ApiModelProperty(value= "浜у湴")
- private String origin;
-
- @ApiModelProperty(value= "鍘傚")
- private String manu;
-
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
- @TableField("manu_date")
- private String manuDate;
-
- @ApiModelProperty(value= "鍝侀」鏁�")
- @TableField("item_num")
- private String itemNum;
-
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
- @TableField("safe_qty")
- private Double safeQty;
-
- @ApiModelProperty(value= "閲嶉噺")
- private Double weight;
-
- @ApiModelProperty(value= "闀垮害")
- private Double length;
-
- @ApiModelProperty(value= "浣撶Н")
- private Double volume;
-
- @ApiModelProperty(value= "涓夋柟缂栫爜")
- @TableField("three_code")
- private String threeCode;
-
- @ApiModelProperty(value= "渚涘簲鍟�")
- private String supp;
-
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
- @TableField("supp_code")
- private String suppCode;
-
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
- @TableField("be_batch")
- private Integer beBatch;
-
- @ApiModelProperty(value= "淇濊川鏈�")
- @TableField("dead_time")
- private String deadTime;
-
- @ApiModelProperty(value= "棰勮澶╂暟")
- @TableField("dead_warn")
- private Integer deadWarn;
-
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
- private Integer source;
-
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer inspect;
-
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
- private Integer danger;
-
- @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= "澶囨敞")
- private String memo;
-
- 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 String getBeBatch$(){
- if (null == this.beBatch){ return null; }
- switch (this.beBatch){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.beBatch);
- }
- }
-
- public String getSource$(){
- if (null == this.source){ return null; }
- switch (this.source){
- case 1:
- return "鍒堕��";
- case 2:
- return "閲囪喘";
- case 3:
- return "澶栧崗";
- default:
- return String.valueOf(this.source);
- }
- }
-
- public String getInspect$(){
- if (null == this.inspect){ return null; }
- switch (this.inspect){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.inspect);
- }
- }
-
- public String getDanger$(){
- if (null == this.danger){ return null; }
- switch (this.danger){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.danger);
- }
- }
-
- 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
deleted file mode 100644
index cd931b9..0000000
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ /dev/null
@@ -1,272 +0,0 @@
-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/MatCode.java b/src/main/java/com/zy/asrs/entity/MatCode.java
deleted file mode 100644
index e6f8431..0000000
--- a/src/main/java/com/zy/asrs/entity/MatCode.java
+++ /dev/null
@@ -1,593 +0,0 @@
-package com.zy.asrs.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.core.common.Cools;
-import com.core.common.SpringUtils;
-import com.zy.system.entity.User;
-import com.zy.system.service.UserService;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-@TableName("bas_mat_code")
-public class MatCode implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 鍟嗗搧缂栧彿
- */
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
- @TableId(value = "mat_no", type = IdType.INPUT)
- @TableField("mat_no")
- private String matNo;
-
- /**
- * 鏉＄爜
- */
- @ApiModelProperty(value= "鏉″舰鐮�")
- private String barcode;
-
- /**
- * 鍟嗗搧鍚嶇О
- */
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
- @TableField("mat_name")
- private String matName;
-
- /**
- * 鐗╂枡鍗曚綅
- */
- @ApiModelProperty(value= "鍗曚綅")
- private String str1;
-
- @ApiModelProperty(value= "瑙勬牸")
- private String str2;
-
- @ApiModelProperty(value= "鍝侀」鏁�")
- private String str3;
-
- @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
- private String str4;
-
- @ApiModelProperty(value= "鍨嬪彿")
- private String str5;
-
- @ApiModelProperty(value= "鎵瑰彿")
- private String str6;
-
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
- private String str7;
-
- @ApiModelProperty(value= "")
- private String str8;
-
- @ApiModelProperty(value= "")
- private String str9;
-
- @ApiModelProperty(value= "")
- private String str10;
-
- @ApiModelProperty(value= "")
- private String str11;
-
- @ApiModelProperty(value= "")
- private String str12;
-
- @ApiModelProperty(value= "")
- private String str13;
-
- @ApiModelProperty(value= "")
- private String str14;
-
- @ApiModelProperty(value= "")
- private String str15;
-
- @ApiModelProperty(value= "")
- private String str16;
-
- @ApiModelProperty(value= "")
- private String str17;
-
- @ApiModelProperty(value= "")
- private String str18;
-
- @ApiModelProperty(value= "")
- private String str19;
-
- @ApiModelProperty(value= "")
- private String str20;
-
- @ApiModelProperty(value= "")
- private String str21;
-
- @ApiModelProperty(value= "")
- private String str22;
-
- @ApiModelProperty(value= "")
- private String str23;
-
- @ApiModelProperty(value= "閲嶉噺")
- private Double num1;
-
- @ApiModelProperty(value= "")
- private Double num2;
-
- @ApiModelProperty(value= "")
- private Double num3;
-
- @ApiModelProperty(value= "")
- private Double num4;
-
- @ApiModelProperty(value= "")
- private Double num5;
-
- @ApiModelProperty(value= "")
- private Double num6;
-
- @ApiModelProperty(value= "")
- private Date date1;
-
- /**
- * 鍒涘缓鑰�
- */
- @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= "")
- private Short status;
-
- public MatCode() {}
-
- public MatCode(String barcode,String matName,String str1,String str2,String str3,String str4,String str5,String str6,String str7,String str8,String str9,String str10,String str11,String str12,String str13,String str14,String str15,String str16,String str17,String str18,String str19,String str20,String str21,String str22,String str23,Double num1,Double num2,Double num3,Double num4,Double num5,Double num6,Date date1,Long appeUser,Date appeTime,Long modiUser,Date modiTime,Short status) {
- this.barcode = barcode;
- this.matName = matName;
- this.str1 = str1;
- this.str2 = str2;
- this.str3 = str3;
- this.str4 = str4;
- this.str5 = str5;
- this.str6 = str6;
- this.str7 = str7;
- this.str8 = str8;
- this.str9 = str9;
- this.str10 = str10;
- this.str11 = str11;
- this.str12 = str12;
- this.str13 = str13;
- this.str14 = str14;
- this.str15 = str15;
- this.str16 = str16;
- this.str17 = str17;
- this.str18 = str18;
- this.str19 = str19;
- this.str20 = str20;
- this.str21 = str21;
- this.str22 = str22;
- this.str23 = str23;
- this.num1 = num1;
- this.num2 = num2;
- this.num3 = num3;
- this.num4 = num4;
- this.num5 = num5;
- this.num6 = num6;
- this.date1 = date1;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.status = status;
- }
-
-// MatCode matCode = new MatCode(
-// 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 String getMatNo() {
- return matNo;
- }
-
- public void setMatNo(String matNo) {
- this.matNo = matNo;
- }
-
- public String getBarcode() {
- return barcode;
- }
-
- public void setBarcode(String barcode) {
- this.barcode = barcode;
- }
-
- public String getMatName() {
- return matName;
- }
-
- public void setMatName(String matName) {
- this.matName = matName;
- }
-
- public String getStr1() {
- return str1;
- }
-
- public void setStr1(String str1) {
- this.str1 = str1;
- }
-
- public String getStr2() {
- return str2;
- }
-
- public void setStr2(String str2) {
- this.str2 = str2;
- }
-
- public String getStr3() {
- return str3;
- }
-
- public void setStr3(String str3) {
- this.str3 = str3;
- }
-
- public String getStr4() {
- return str4;
- }
-
- public void setStr4(String str4) {
- this.str4 = str4;
- }
-
- public String getStr5() {
- return str5;
- }
-
- public void setStr5(String str5) {
- this.str5 = str5;
- }
-
- public String getStr6() {
- return str6;
- }
-
- public void setStr6(String str6) {
- this.str6 = str6;
- }
-
- public String getStr7() {
- return str7;
- }
-
- public void setStr7(String str7) {
- this.str7 = str7;
- }
-
- public String getStr8() {
- return str8;
- }
-
- public void setStr8(String str8) {
- this.str8 = str8;
- }
-
- public String getStr9() {
- return str9;
- }
-
- public void setStr9(String str9) {
- this.str9 = str9;
- }
-
- public String getStr10() {
- return str10;
- }
-
- public void setStr10(String str10) {
- this.str10 = str10;
- }
-
- public String getStr11() {
- return str11;
- }
-
- public void setStr11(String str11) {
- this.str11 = str11;
- }
-
- public String getStr12() {
- return str12;
- }
-
- public void setStr12(String str12) {
- this.str12 = str12;
- }
-
- public String getStr13() {
- return str13;
- }
-
- public void setStr13(String str13) {
- this.str13 = str13;
- }
-
- public String getStr14() {
- return str14;
- }
-
- public void setStr14(String str14) {
- this.str14 = str14;
- }
-
- public String getStr15() {
- return str15;
- }
-
- public void setStr15(String str15) {
- this.str15 = str15;
- }
-
- public String getStr16() {
- return str16;
- }
-
- public void setStr16(String str16) {
- this.str16 = str16;
- }
-
- public String getStr17() {
- return str17;
- }
-
- public void setStr17(String str17) {
- this.str17 = str17;
- }
-
- public String getStr18() {
- return str18;
- }
-
- public void setStr18(String str18) {
- this.str18 = str18;
- }
-
- public String getStr19() {
- return str19;
- }
-
- public void setStr19(String str19) {
- this.str19 = str19;
- }
-
- public String getStr20() {
- return str20;
- }
-
- public void setStr20(String str20) {
- this.str20 = str20;
- }
-
- public String getStr21() {
- return str21;
- }
-
- public void setStr21(String str21) {
- this.str21 = str21;
- }
-
- public String getStr22() {
- return str22;
- }
-
- public void setStr22(String str22) {
- this.str22 = str22;
- }
-
- public String getStr23() {
- return str23;
- }
-
- public void setStr23(String str23) {
- this.str23 = str23;
- }
-
- public Double getNum1() {
- return num1;
- }
-
- public void setNum1(Double num1) {
- this.num1 = num1;
- }
-
- public Double getNum2() {
- return num2;
- }
-
- public void setNum2(Double num2) {
- this.num2 = num2;
- }
-
- public Double getNum3() {
- return num3;
- }
-
- public void setNum3(Double num3) {
- this.num3 = num3;
- }
-
- public Double getNum4() {
- return num4;
- }
-
- public void setNum4(Double num4) {
- this.num4 = num4;
- }
-
- public Double getNum5() {
- return num5;
- }
-
- public void setNum5(Double num5) {
- this.num5 = num5;
- }
-
- public Double getNum6() {
- return num6;
- }
-
- public void setNum6(Double num6) {
- this.num6 = num6;
- }
-
- public Date getDate1() {
- return date1;
- }
-
- public String getDate1$(){
- if (Cools.isEmpty(this.date1)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.date1);
- }
-
- public void setDate1(Date date1) {
- this.date1 = date1;
- }
-
- 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 Short getStatus() {
- return status;
- }
-
- public void setStatus(Short status) {
- this.status = status;
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/RgvNode.java b/src/main/java/com/zy/asrs/entity/RgvNode.java
deleted file mode 100644
index 03ced84..0000000
--- a/src/main/java/com/zy/asrs/entity/RgvNode.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.zy.asrs.entity;
-
-import lombok.Data;
-
-@Data
-public class RgvNode {
-
- private Integer path;//璺緞鍊�
-
- private Boolean lock = false;//璺緞閿佸畾
-
- private Integer rgvNo = 0;//RGV鍙�
-
- private Integer wrkNo = 0;//浠诲姟鍙�
-
- public RgvNode(Integer path) {
- this.path = path;
- }
-}
diff --git a/src/main/java/com/zy/asrs/entity/RgvOneSign.java b/src/main/java/com/zy/asrs/entity/RgvOneSign.java
deleted file mode 100644
index abbbbcc..0000000
--- a/src/main/java/com/zy/asrs/entity/RgvOneSign.java
+++ /dev/null
@@ -1,55 +0,0 @@
-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 io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-@TableName("bas_rgv_one_sign")
-public class RgvOneSign implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 缂栧彿
- */
- @ApiModelProperty(value= "缂栧彿")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 鍐呭
- */
- @ApiModelProperty(value= "1妤兼爣璁�")
- @TableField("rgv_one_sign")
- private Integer rgvOneSign;
-
- /**
- * 鍐呭
- */
- @ApiModelProperty(value= "oneSign")
- @TableField("rgv_one_type")
- private String rgvOneType;
-
- public RgvOneSign() {}
-
- public RgvOneSign(Integer rgvOneSign) {
- this.rgvOneSign = rgvOneSign;
- }
-
- public RgvOneSign(Integer rgvOneSign, String rgvOneType) {
- this.rgvOneSign = rgvOneSign;
- this.rgvOneType = rgvOneType;
- }
-
-// RgvOneSign rgvOneSign = new RgvOneSign(
-// null // 鍐呭[闈炵┖]
-// );
-
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
deleted file mode 100644
index 5eca9e3..0000000
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package com.zy.asrs.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.core.common.Cools;
-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= "鍟嗗搧缂栧彿")
- private String matnr;
-
- /**
- * 鐗╂枡鎻忚堪
- */
- @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;
-
- /**
- * 鏁伴噺
- */
- @ApiModelProperty(value= "鏁伴噺")
- private Double anfme;
-
- /**
- * 鍗曚綅
- */
- @ApiModelProperty(value= "鍗曚綅")
- private String altme;
-
- /**
- * 鎵樼洏鏉＄爜
- */
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
- private String zpallet;
-
- /**
- * 鐢ㄦ埛ID
- */
- @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
- private String bname;
-
- @ApiModelProperty(value= "搴撲綅鍙�")
- @TableField("loc_no")
- private Date locNo;
-
- @ApiModelProperty(value= "鐘舵��")
- private String status;
-
- @ApiModelProperty(value= "鍏ュ嚭鐘舵��")
- @TableField("io_status")
- private String ioStatus;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("modi_time")
- private Date modiTime;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("modi_user")
- private Long modiUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("appe_time")
- private Date appeTime;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- @TableField("appe_user")
- private Long appeUser;
-
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- 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/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
deleted file mode 100644
index 9b092bb..0000000
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ /dev/null
@@ -1,362 +0,0 @@
-package com.zy.asrs.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableName;
-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_wrk_detl")
-public class WrkDetl implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 宸ヤ綔鍙�
- */
- @ApiModelProperty(value= "宸ヤ綔鍙�")
- @TableField("wrk_no")
- private Integer wrkNo;
-
- /**
- * 宸ヤ綔鏃堕棿
- */
- @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
- @TableField("io_time")
- private Date ioTime;
-
- /**
- * 鏁伴噺
- */
- @ApiModelProperty(value= "鏁伴噺")
- private Double anfme;
-
- /**
- * 鎵樼洏鏉＄爜
- */
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
- private String zpallet;
-
- /**
- * 鐗╂枡
- */
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
- private String matnr;
-
- /**
- * 鐗╂枡鎻忚堪
- */
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
- private String maktx;
-
- /**
- * 鎵瑰彿
- */
- @ApiModelProperty(value= "鎵瑰彿")
- private String batch;
-
- /**
- * 鍗曟嵁缂栧彿
- */
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
- @TableField("order_no")
- private String orderNo;
-
- /**
- * 瑙勬牸
- */
- @ApiModelProperty(value= "瑙勬牸")
- private String specs;
-
- /**
- * 鍨嬪彿
- */
- @ApiModelProperty(value= "鍨嬪彿")
- private String model;
-
- /**
- * 棰滆壊
- */
- @ApiModelProperty(value= "棰滆壊")
- private String color;
-
- /**
- * 鍝佺墝
- */
- @ApiModelProperty(value= "鍝佺墝")
- private String brand;
-
- /**
- * 鍗曚綅
- */
- @ApiModelProperty(value= "鍗曚綅")
- private String unit;
-
- /**
- * 鍗曚环
- */
- @ApiModelProperty(value= "鍗曚环")
- private Double price;
-
- /**
- * sku
- */
- @ApiModelProperty(value= "sku")
- private String sku;
-
- /**
- * 鍗曚綅閲�
- */
- @ApiModelProperty(value= "鍗曚綅閲�")
- private Double units;
-
- /**
- * 鏉＄爜
- */
- @ApiModelProperty(value= "鏉＄爜")
- private String barcode;
-
- /**
- * 浜у湴
- */
- @ApiModelProperty(value= "浜у湴")
- private String origin;
-
- /**
- * 鍘傚
- */
- @ApiModelProperty(value= "鍘傚")
- private String manu;
-
- /**
- * 鐢熶骇鏃ユ湡
- */
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
- @TableField("manu_date")
- private String manuDate;
-
- /**
- * 鍝侀」鏁�
- */
- @ApiModelProperty(value= "鍝侀」鏁�")
- @TableField("item_num")
- private String itemNum;
-
- /**
- * 瀹夊叏搴撳瓨閲�
- */
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
- @TableField("safe_qty")
- private Double safeQty;
-
- /**
- * 閲嶉噺
- */
- @ApiModelProperty(value= "閲嶉噺")
- private Double weight;
-
- /**
- * 闀垮害
- */
- @ApiModelProperty(value= "闀垮害")
- private Double length;
-
- /**
- * 浣撶Н
- */
- @ApiModelProperty(value= "浣撶Н")
- private Double volume;
-
- /**
- * 涓夋柟缂栫爜
- */
- @ApiModelProperty(value= "涓夋柟缂栫爜")
- @TableField("three_code")
- private String threeCode;
-
- /**
- * 渚涘簲鍟�
- */
- @ApiModelProperty(value= "渚涘簲鍟�")
- private String supp;
-
- /**
- * 渚涘簲鍟嗙紪鐮�
- */
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
- @TableField("supp_code")
- private String suppCode;
-
- /**
- * 鏄惁鎵规 1: 鏄� 0: 鍚�
- */
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
- @TableField("be_batch")
- private Integer beBatch;
-
- /**
- * 淇濊川鏈�
- */
- @ApiModelProperty(value= "淇濊川鏈�")
- @TableField("dead_time")
- private String deadTime;
-
- /**
- * 棰勮澶╂暟
- */
- @ApiModelProperty(value= "棰勮澶╂暟")
- @TableField("dead_warn")
- private Integer deadWarn;
-
- /**
- * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
- */
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
- private Integer source;
-
- /**
- * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
- * 寰愬伐姹変簯鎷嗗灈鏍囪 0: 鏈媶锛堥粯璁わ級 1: 宸叉媶
- */
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer inspect;
-
- /**
- * 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
- */
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
- private Integer danger;
-
- /**
- * 淇敼浜哄憳
- */
- @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= "澶囨敞")
- private String memo;
-
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
- }
-
- public String getBeBatch$(){
- if (null == this.beBatch){ return null; }
- switch (this.beBatch){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.beBatch);
- }
- }
-
- public String getSource$(){
- if (null == this.source){ return null; }
- switch (this.source){
- case 1:
- return "鍒堕��";
- case 2:
- return "閲囪喘";
- case 3:
- return "澶栧崗";
- default:
- return String.valueOf(this.source);
- }
- }
-
- public String getInspect$(){
- if (null == this.inspect){ return null; }
- switch (this.inspect){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.inspect);
- }
- }
-
- public String getDanger$(){
- if (null == this.danger){ return null; }
- switch (this.danger){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.danger);
- }
- }
-
- 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/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 8c03867..70985d8 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -371,15 +371,6 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.wrkDate);
}
- 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 String getStaNo$(){
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
BasDevp basDevp = service.selectById(this.staNo);
@@ -394,15 +385,6 @@
BasDevp basDevp = service.selectById(this.sourceStaNo);
if (!Cools.isEmpty(basDevp)){
return String.valueOf(basDevp.getDevNo());
- }
- return null;
- }
-
- 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;
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastCrn.java b/src/main/java/com/zy/asrs/entity/WrkMastCrn.java
deleted file mode 100644
index 7d403da..0000000
--- a/src/main/java/com/zy/asrs/entity/WrkMastCrn.java
+++ /dev/null
@@ -1,284 +0,0 @@
-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 lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-@Data
-@TableName("asr_wrk_mast_crn")
-public class WrkMastCrn implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 宸ヤ綔鍙�
- */
- @ApiModelProperty(value= "宸ヤ綔鍙�")
- @TableId(value = "wrk_no", type = IdType.INPUT)
- @TableField("wrk_no")
- private Long wrkNo;
-
- /**
- * 宸ヤ綔鐘舵��
- */
- @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("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= "宸ヤ綔鏃堕棿")
- @TableField("io_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date ioTime;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("modi_user")
- private String modiUser;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("modi_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
-
- /**
- * 宸ヤ綔鍙�1
- */
- @ApiModelProperty(value= "宸ヤ綔鍙�1")
- @TableField("wrk_no_one")
- private Long wrkNoOne;
-
- /**
- * 宸ヤ綔鍙�2
- */
- @ApiModelProperty(value= "宸ヤ綔鍙�2")
- @TableField("wrk_no_two")
- private Long wrkNoTwo;
-
- /**
- * 鐩爣搴撲綅1
- */
- @ApiModelProperty(value= "鐩爣搴撲綅1")
- @TableField("loc_no_one")
- private String locNoOne;
-
- /**
- * 鐩爣搴撲綅2
- */
- @ApiModelProperty(value= "鐩爣搴撲綅2")
- @TableField("loc_no_two")
- private String locNoTwo;
-
- /**
- * 鐩爣绔�1
- */
- @ApiModelProperty(value= "鐩爣绔�1")
- @TableField("sta_no_one")
- private Integer staNoOne;
-
- /**
- * 鐩爣绔�2
- */
- @ApiModelProperty(value= "鐩爣绔�2")
- @TableField("sta_no_two")
- private Integer staNoTwo;
-
- /**
- * 婧愮珯1
- */
- @ApiModelProperty(value= "婧愮珯1")
- @TableField("source_sta_no_one")
- private Integer sourceStaNoOne;
-
- /**
- * 婧愮珯2
- */
- @ApiModelProperty(value= "婧愮珯2")
- @TableField("source_sta_no_two")
- private Integer sourceStaNoTwo;
-
- /**
- * 婧愬簱浣�1
- */
- @ApiModelProperty(value= "婧愬簱浣�1")
- @TableField("source_loc_no_one")
- private String sourceLocNoOne;
-
- /**
- * 婧愬簱浣�2
- */
- @ApiModelProperty(value= "婧愬簱浣�2")
- @TableField("source_loc_no_two")
- private String sourceLocNoTwo;
-
- public WrkMastCrn() {}
-
- public WrkMastCrn(Long wrkNo, Long wrkSts, Integer ioType, Integer crnNo, String locNo, Integer staNo, Integer sourceStaNo, String sourceLocNo, String locSts, Date ioTime, String modiUser, Date modiTime, Long wrkNoOne, Long wrkNoTwo, String locNoOne, String locNoTwo, Integer staNoOne, Integer staNoTwo, Integer sourceStaNoOne, Integer sourceStaNoTwo, String sourceLocNoOne, String sourceLocNoTwo) {
- this.wrkNo = wrkNo;
- this.wrkSts = wrkSts;
- this.ioType = ioType;
- this.crnNo = crnNo;
- this.locNo = locNo;
- this.staNo = staNo;
- this.sourceStaNo = sourceStaNo;
- this.sourceLocNo = sourceLocNo;
- this.locSts = locSts;
- this.ioTime = ioTime;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.wrkNoOne = wrkNoOne;
- this.wrkNoTwo = wrkNoTwo;
- this.locNoOne = locNoOne;
- this.locNoTwo = locNoTwo;
- this.staNoOne = staNoOne;
- this.staNoTwo = staNoTwo;
- this.sourceStaNoOne = sourceStaNoOne;
- this.sourceStaNoTwo = sourceStaNoTwo;
- this.sourceLocNoOne = sourceLocNoOne;
- this.sourceLocNoTwo = sourceLocNoTwo;
- }
-
-// WrkMastCrn wrkMastCrn = new WrkMastCrn(
-// null, // 宸ヤ綔鍙穂闈炵┖]
-// null, // 宸ヤ綔鐘舵��
-// null, // 鍏ュ嚭搴撶被鍨�
-// null, // 鍫嗗灈鏈�
-// null, // 鐩爣搴撲綅
-// null, // 鐩爣绔�
-// null, // 婧愮珯
-// null, // 婧愬簱浣�
-// null, //
-// null, // 宸ヤ綔鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 宸ヤ綔鍙�1
-// null, // 宸ヤ綔鍙�2
-// null, // 鐩爣搴撲綅1
-// null, // 鐩爣搴撲綅2
-// null, // 鐩爣绔�1
-// null, // 鐩爣绔�2
-// null, // 婧愮珯1
-// null, // 婧愮珯2
-// null, // 婧愬簱浣�1
-// null // 婧愬簱浣�2
-// );
-
- 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 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 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 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 String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
- }
-
-
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastExecute.java b/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
deleted file mode 100644
index 1266ed9..0000000
--- a/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
+++ /dev/null
@@ -1,318 +0,0 @@
-package com.zy.asrs.entity;
-
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableField;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.core.common.SpringUtils;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@Data
-@TableName("jar_wrk_mast_execute")
-public class WrkMastExecute implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 宸ヤ綔鍙�
- */
- @ApiModelProperty(value= "宸ヤ綔鍙�")
- @TableField("wrk_no")
- private Long wrkNo;
-
- /**
- * 鍏ュ簱婧愮珯鐐�
- */
- @ApiModelProperty(value= "鍏ュ簱婧愮珯鐐�")
- @TableField("enter_sta_no")
- private Integer enterStaNo;
-
- /**
- * 鍏ュ簱鐩爣绔欑偣
- */
- @ApiModelProperty(value= "鍏ュ簱鐩爣绔欑偣")
- @TableField("out_sta_no")
- private Integer outStaNo;
-
- /**
- * 鍏ョ～鍖栫綈绔欑偣
- */
- @ApiModelProperty(value= "鍏ョ～鍖栫綈绔欑偣")
- @TableField("jar_enter_sta_no")
- private Integer jarEnterStaNo;
-
- /**
- * 鍑虹～鍖栫綈绔欑偣
- */
- @ApiModelProperty(value= "鍑虹～鍖栫綈绔欑偣")
- @TableField("jar_out_sta_no")
- private Integer jarOutStaNo;
-
- /**
- * 璁惧ID
- */
- @ApiModelProperty(value= "璁惧ID")
- @TableField("jar_id")
- private Integer jarId;
-
- /**
- * 鍖哄煙
- */
- @ApiModelProperty(value= "鍖哄煙")
- @TableField("jar_regin")
- private Integer jarRegin;
-
- /**
- * 鐘舵��
- */
- @ApiModelProperty(value= "鐘舵��")
- private Integer status;
-
- /**
- * 绌挎鏉�
- */
- @ApiModelProperty(value= "绌挎鏉�")
- @TableField("ste_id")
- private Integer steId;
-
- /**
- * RGV
- */
- @ApiModelProperty(value= "RGV")
- @TableField("rgv_id")
- private Integer rgvId;
-
- /**
- * RGV
- */
- @ApiModelProperty(value= "RGV")
- @TableField("rgv_end_id")
- private Integer rgvEndId;
-
- /**
- * 浣滀笟鏃堕棿
- */
- @ApiModelProperty(value= "浣滀笟鏃堕棿")
- @TableField("io_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date ioTime;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @ApiModelProperty(value= "鍒涘缓鏃堕棿")
- @TableField("modi_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
-
- /**
- * 鏇存柊鏃堕棿
- */
- @ApiModelProperty(value= "鏇存柊鏃堕棿")
- @TableField("appe_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
-
- /**
- * 浠诲姟鐘舵�� 0: 鍒濆 1: 浣滀笟涓� 2: 瀹屾垚
- */
- @ApiModelProperty(value= "浠诲姟鐘舵�� 0: 鍒濆 1: 浣滀笟涓� 2: 瀹屾垚 ")
- @TableField("wrk_type")
- private Integer wrkType;
-
- /**
- * 宸ヤ綔鐘舵��
- * 0:鍒濆 wrk_sts
- * 1锛歊GV灏忚溅閬胯銆�2锛氶伩璁╁畬鎴愩��3锛氬紑闂ㄤ腑銆�4锛氬紑闂ㄥ畬鎴愩��5锛氭洿鏂板畬鎴� //io_type = 1銆�3
- * 1锛歊GV灏忚溅閬胯銆�2锛氶伩璁╁畬鎴愩��3锛氬叧闂ㄤ腑銆�4锛氬叧闂ㄥ畬鎴愩��5锛氭洿鏂板畬鎴� //io_type = 2銆�4
- * 1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歳gv鍙栬揣銆�4锛歳gv鍙栬揣瀹屾垚銆�5锛歋te绌挎鐗堝叆纭寲缃愩��6锛氬叆缃愬畬鎴愩��7锛氭洿鏂板畬鎴� //io_type = 5 STE A闈㈢┛姊溅
- * 1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歋te绌挎鐗堝彇璐с��4锛氬彇璐у畬鎴愮瓑寰呬笅涓�姝ャ��5锛歋te绌挎鐗堟斁璐ц嚦鍐峰嵈姹犮��6锛氭斁璐у畬鎴愩��7锛氭洿鏂板畬鎴� //io_type = 6 STE B闈㈢┛姊溅
- * 1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歋te绌挎鐗堢Щ鍔ㄤ腑銆�4锛氱Щ鍔ㄥ畬鎴愩��5锛氭洿鏂板畬鎴� //io_type = 7 B=>C 銆�8 C=>B
- * 1锛歋te绌挎鐗堝彇鏀捐揣涓��2锛氭斁璐у畬鎴愮瓑寰呬笅涓�姝ャ��3锛氳緭閫佺嚎浠诲姟涓嬪彂瀹屾垚銆�4锛氭洿鏂板畬鎴� //io_type = 9 STE 鏈杈撻�佺嚎
- * 1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歋te绌挎鐗堢Щ鍔ㄤ腑銆�4锛氱Щ鍔ㄥ畬鎴愩��5锛氭洿鏂板畬鎴� //io_type = 10銆�11
- * 1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歋te绌挎鐗堢Щ鍔ㄤ腑銆�4锛氱Щ鍔ㄥ畬鎴愩��5锛氭洿鏂板畬鎴� //io_type = 10銆�11
- */
- @ApiModelProperty(value= "宸ヤ綔鐘舵��")
- @TableField("wrk_sts")
- private Integer wrkSts;
-
- /**
- * 浠诲姟绫诲瀷 0: 鏈煡 1: 寮�杩涙枡闂� 2: 鍏宠繘鏂欓棬 3: 寮�鍑烘枡闂� 4: 鍏冲嚭鏂欓棬 5: 鍏ョ～鍖栫綈 6: 鍏ュ喎鍗存Ы 7: 绌挎杞﹁繘鍐峰嵈妲� B=>C 8: 绌挎杞︾寮�鍐峰嵈妲� C=>B 9: 鍑哄喎鍗存Ы 10锛欰=>B 11:B=>A
- */
- @ApiModelProperty(value= "浠诲姟绫诲瀷 0: 鏈煡 1: 寮�杩涙枡闂� 2: 鍏宠繘鏂欓棬 3: 寮�鍑烘枡闂� 4: 鍏冲嚭鏂欓棬 5: 鍏ョ～鍖栫綈 6: 鍏ュ喎鍗存Ы 7: 绌挎杞﹁繘鍐峰嵈妲� 8: 绌挎杞︾寮�鍐峰嵈妲� 9: 鍑哄喎鍗存Ы 10锛欰=>B 11:B=>A ")
- @TableField("io_type")
- private Integer ioType;
-
- /**
- * 璁惧 0: 鏈煡 1: 纭寲缃� 2: 鍐峰嵈妲�
- */
- @ApiModelProperty(value= "璁惧 0: 鏈煡 1: 纭寲缃� 2: 鍐峰嵈妲� 3: 纭寲缃�==>鍐峰嵈妲� ")
- private Integer type;
-
- public WrkMastExecute() {}
-
- public WrkMastExecute(Long wrkNo,Integer enterStaNo,Integer outStaNo,Integer jarEnterStaNo,Integer jarOutStaNo,Integer jarId,Integer jarRegin,Integer status,Integer steId,Integer rgvId,Date ioTime,Date modiTime,Date appeTime,Integer wrkType,Integer wrkSts,Integer ioType,Integer type) {
- this.wrkNo = wrkNo;
- this.enterStaNo = enterStaNo;
- this.outStaNo = outStaNo;
- this.jarEnterStaNo = jarEnterStaNo;
- this.jarOutStaNo = jarOutStaNo;
- this.jarId = jarId;
- this.jarRegin = jarRegin;
- this.status = status;
- this.steId = steId;
- this.rgvId = rgvId;
- this.ioTime = ioTime;
- this.modiTime = modiTime;
- this.appeTime = appeTime;
- this.wrkType = wrkType;
- this.wrkSts = wrkSts;
- this.ioType = ioType;
- this.type = type;
- }
-
- public WrkMastExecute(BasJarMast basJarMast) {
- Date now = new Date();
- this.wrkNo = basJarMast.getWrkNo();
- this.enterStaNo = basJarMast.getEnterStaNo(); //鍏ュ簱婧愮珯鐐�
- this.outStaNo = basJarMast.getOutStaNo(); //鍏ュ簱鐩爣绔欑偣
- this.jarEnterStaNo = basJarMast.getJarEnterStaNo(); //鍏ョ～鍖栫綈绔欑偣
- this.jarOutStaNo = basJarMast.getJarOutStaNo(); //鍑虹～鍖栫綈绔欑偣
-// this.jarId = jarId;
- this.jarRegin = basJarMast.getJarRegin();//鍖哄煙
- this.status = 0;
-// this.steId = steId;
-// this.rgvId = rgvId;
- this.ioTime = basJarMast.getIoTime();
- this.modiTime = now;
- this.appeTime = now;
- this.wrkType = 0;
- this.wrkSts = 0;
-// this.ioType = ioType;
-// this.type = type;
- }
-
-
-// WrkMastExecute wrkMastExecute = new WrkMastExecute(
-// null, // 宸ヤ綔鍙穂闈炵┖]
-// null, // 鍏ュ簱婧愮珯鐐筟闈炵┖]
-// null, // 鍏ュ簱鐩爣绔欑偣[闈炵┖]
-// null, // 鍏ョ～鍖栫綈绔欑偣[闈炵┖]
-// null, // 鍑虹～鍖栫綈绔欑偣[闈炵┖]
-// null, // 璁惧ID[闈炵┖]
-// null, // 鍖哄煙[闈炵┖]
-// null, // 鐘舵�乕闈炵┖]
-// null, // 绌挎鏉縖闈炵┖]
-// null, // RGV[闈炵┖]
-// null, // 浣滀笟鏃堕棿
-// null, // 鍒涘缓鏃堕棿
-// null, // 鏇存柊鏃堕棿
-// null, // 浠诲姟鐘舵�乕闈炵┖]
-// null, // 宸ヤ綔鐘舵�乕闈炵┖]
-// null, // 浠诲姟绫诲瀷[闈炵┖]
-// null // 璁惧[闈炵┖]
-// );
-
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
- }
-
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- public String getWrkType$(){
- if (null == this.wrkType){ return null; }
- switch (this.wrkType){
- case 0:
- return "鍒濆";
- case 1:
- return "浣滀笟涓�";
- case 2:
- return "瀹屾垚";
- default:
- return String.valueOf(this.wrkType);
- }
- }
-
- /**
- * 浠诲姟绫诲瀷 0: 鏈煡 1: 寮�杩涙枡闂� 2: 鍏宠繘鏂欓棬 3: 寮�鍑烘枡闂� 4: 鍏冲嚭鏂欓棬 5: 鍏ョ～鍖栫綈 6: 鍏ュ喎鍗存Ы 7: 绌挎杞﹁繘鍐峰嵈妲� B=>C 8: 绌挎杞︾寮�鍐峰嵈妲� C=>B 9: 鍑哄喎鍗存Ы 10锛欰=>B 11:B=>A
- */
- public String getIoType$(){
- if (null == this.ioType){ return null; }
- switch (this.ioType){
- case 0:
- return this.ioType+":鏈煡";
- case 1:
- return this.ioType+":寮�杩涙枡闂�";
- case 2:
- return this.ioType+":鍏宠繘鏂欓棬";
- case 3:
- return this.ioType+":寮�鍑烘枡闂�";
- case 4:
- return this.ioType+":鍏冲嚭鏂欓棬";
- case 5:
- return this.ioType+":鍏ョ～鍖栫綈";
- case 6:
- return this.ioType+":鍏ュ喎鍗存Ы";
- case 7:
- return this.ioType+":绌挎杞﹁繘鍐峰嵈妲�:B=>C";
- case 8:
- return this.ioType+":绌挎杞︾寮�鍐峰嵈妲�:C=>B";
- case 9:
- return this.ioType+":鍑哄喎鍗存Ы";
- case 10:
- return this.ioType+":A=>B";
- case 11:
- return this.ioType+":B=>A";
- default:
- return String.valueOf(this.ioType);
- }
- }
-
- public String getType$(){
- if (null == this.type){ return null; }
- switch (this.type){
- case 0:
- return "鏈煡";
- case 1:
- return "纭寲缃�";
- case 2:
- return "鍐峰嵈妲�";
- default:
- return String.valueOf(this.type);
- }
- }
-
- public Integer getWrkStsComplete(){
- return this.wrkSts+1;
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastSplitTwin.java b/src/main/java/com/zy/asrs/entity/WrkMastSplitTwin.java
deleted file mode 100644
index 1ad6061..0000000
--- a/src/main/java/com/zy/asrs/entity/WrkMastSplitTwin.java
+++ /dev/null
@@ -1,286 +0,0 @@
-package com.zy.asrs.entity;
-
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableField;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@Data
-@TableName("asr_wrk_mast_split_twin")
-public class WrkMastSplitTwin implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 宸ヤ綔鍙�
- */
- @ApiModelProperty(value= "宸ヤ綔鍙�")
- @TableField("wrk_no")
- private Long wrkNo;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("update_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /**
- * 宸ヤ綅
- */
- @ApiModelProperty(value= "宸ヤ綅")
- private Integer type;
-
- /**
- * 宸ヤ綔鐘舵�� 0: 鍒濆 1: 绛夊緟鍙栬揣瀹屾垚 2: 鍙栬揣瀹屾垚寰呬綔涓� 3: 绛夊緟鏀捐揣瀹屾垚 4: 瀹屾垚
- */
- @ApiModelProperty(value= "宸ヤ綔鐘舵�� 0: 鍒濆 1: 绛夊緟鍙栬揣瀹屾垚 2: 鍙栬揣瀹屾垚寰呬綔涓� 3: 绛夊緟鏀捐揣瀹屾垚 4: 瀹屾垚 ")
- @TableField("wrk_sts")
- private Integer wrkSts;
-
- /**
- * 琛屽彿
- */
- @ApiModelProperty(value= "琛屽彿")
- @TableField("line_number")
- private Integer lineNumber;
-
- /**
- * 宸ヤ綔绫诲瀷 0: 鏈煡 1: 鍙� 2: 鏀� 3: 鍙栨斁 4: 瀹屾垚
- */
- @ApiModelProperty(value= "宸ヤ綔绫诲瀷 0: 鏈煡 1: 鍙� 2: 鏀� 3: 鍙栨斁 4: 瀹屾垚 ")
- @TableField("wrk_type")
- private Integer wrkType;
-
- /**
- * 鏍囪鏃堕棿
- */
- @ApiModelProperty(value= "鏍囪鏃堕棿")
- @TableField("bign_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date bignTime;
-
- /**
- * 鍫嗗灈鏈哄彿
- */
- @ApiModelProperty(value= "鍫嗗灈鏈哄彿")
- @TableField("crn_no")
- private Integer crnNo;
-
- /**
- * 璧风偣
- */
- @ApiModelProperty(value= "璧风偣")
- @TableField("wrk_start")
- private String wrkStart;
-
- /**
- * 缁堢偣
- */
- @ApiModelProperty(value= "缁堢偣")
- @TableField("wrk_end")
- private String wrkEnd;
-
- /**
- * 璧风偣鎺�
- */
- @ApiModelProperty(value= "璧风偣鎺�")
- @TableField("start_row")
- private Integer startRow;
-
- /**
- * 璧风偣鍒�
- */
- @ApiModelProperty(value= "璧风偣鍒�")
- @TableField("start_bay")
- private Integer startBay;
-
- /**
- * 璧风偣灞�
- */
- @ApiModelProperty(value= "璧风偣灞�")
- @TableField("start_lev")
- private Integer startLev;
-
- /**
- * 缁堢偣鎺�
- */
- @ApiModelProperty(value= "缁堢偣鎺�")
- @TableField("end_row")
- private Integer endRow;
-
- /**
- * 缁堢偣鍒�
- */
- @ApiModelProperty(value= "缁堢偣鍒�")
- @TableField("end_bay")
- private Integer endBay;
-
- /**
- * 缁堢偣灞�
- */
- @ApiModelProperty(value= "缁堢偣灞�")
- @TableField("end_lev")
- private Integer endLev;
-
- /**
- * 浠诲姟绫诲瀷 0: 鏈煡 1: 鍏ュ簱 2: 鍑哄簱
- */
- @ApiModelProperty(value= "浠诲姟绫诲瀷 0: 鏈煡 1: 鍏ュ簱 2: 鍑哄簱 ")
- @TableField("io_type")
- private Integer ioType;
-
- public WrkMastSplitTwin() {}
-
- public WrkMastSplitTwin(WrkMast wrkMast,Integer crnStation,Date now) {
- this.wrkNo = wrkMast.getWrkNo().longValue();
- this.createTime = now;
- this.updateTime = now;
- this.type = crnStation; //宸ヤ綅
- this.lineNumber = wrkMast.getIoPri().intValue();
- this.bignTime = wrkMast.getIoTime();
- this.crnNo = wrkMast.getCrnNo();
- }
-
- public WrkMastSplitTwin(Long wrkNo,Date createTime,Date updateTime,Integer type,Integer wrkSts,Integer lineNumber,Integer wrkType,Date bignTime,Integer crnNo,String wrkStart,String wrkEnd,Integer startRow,Integer startBay,Integer startLev,Integer endRow,Integer endBay,Integer endLev,Integer ioType) {
- this.wrkNo = wrkNo;
- this.createTime = createTime;
- this.updateTime = updateTime;
- this.type = type;
- this.wrkSts = wrkSts;
- this.lineNumber = lineNumber;
- this.wrkType = wrkType;
- this.bignTime = bignTime;
- this.crnNo = crnNo;
- this.wrkStart = wrkStart;
- this.wrkEnd = wrkEnd;
- this.startRow = startRow;
- this.startBay = startBay;
- this.startLev = startLev;
- this.endRow = endRow;
- this.endBay = endBay;
- this.endLev = endLev;
- this.ioType = ioType;
- }
-
-// WrkMastSplitTwin wrkMastSplitTwin = new WrkMastSplitTwin(
-// null, // 宸ヤ綔鍙穂闈炵┖]
-// null, // 娣诲姞鏃堕棿
-// null, // 淇敼鏃堕棿
-// null, // 宸ヤ綅[闈炵┖]
-// null, // 宸ヤ綔鐘舵�乕闈炵┖]
-// null, // 琛屽彿[闈炵┖]
-// null, // 宸ヤ綔绫诲瀷[闈炵┖]
-// null, // 鏍囪鏃堕棿
-// null, // 鍫嗗灈鏈哄彿[闈炵┖]
-// null, // 璧风偣[闈炵┖]
-// null, // 缁堢偣[闈炵┖]
-// null, // 璧风偣鎺抂闈炵┖]
-// null, // 璧风偣鍒梉闈炵┖]
-// null, // 璧风偣灞俒闈炵┖]
-// null, // 缁堢偣鎺抂闈炵┖]
-// null, // 缁堢偣鍒梉闈炵┖]
-// null, // 缁堢偣灞俒闈炵┖]
-// null // 浠诲姟绫诲瀷[闈炵┖]
-// );
-
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
- public String getWrkSts$(){
- if (null == this.wrkSts){ return null; }
- switch (this.wrkSts){
- case 0:
- return "鍒濆";
- case 1:
- return "绛夊緟鍙栬揣瀹屾垚";
- case 2:
- return "鍙栬揣瀹屾垚寰呬綔涓�";
- case 3:
- return "绛夊緟鏀捐揣瀹屾垚";
- case 4:
- return "瀹屾垚";
- default:
- return String.valueOf(this.wrkSts);
- }
- }
-
- public String getWrkType$(){
- if (null == this.wrkType){ return null; }
- switch (this.wrkType){
- case 0:
- return "鏈煡";
- case 1:
- return "鍙�";
- case 2:
- return "鏀�";
- case 3:
- return "鍙栨斁";
- case 4:
- return "瀹屾垚";
- default:
- return String.valueOf(this.wrkType);
- }
- }
-
- public String getBignTime$(){
- if (Cools.isEmpty(this.bignTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.bignTime);
- }
-
- public String getIoType$(){
- if (null == this.ioType){ return null; }
- switch (this.ioType){
- case 0:
- return "鏈煡";
- case 1:
- return "鍏ュ簱";
- case 2:
- return "鍑哄簱";
- default:
- return String.valueOf(this.ioType);
- }
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastSta.java b/src/main/java/com/zy/asrs/entity/WrkMastSta.java
deleted file mode 100644
index a500865..0000000
--- a/src/main/java/com/zy/asrs/entity/WrkMastSta.java
+++ /dev/null
@@ -1,202 +0,0 @@
-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 io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-@Data
-@TableName("asr_wrk_mast_sta")
-public class WrkMastSta implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 宸ヤ綔鍙�
- */
- @ApiModelProperty(value= "宸ヤ綔鍙�")
- @TableField("wrk_no")
- private Long wrkNo;
-
- /**
- * 宸ヤ綔妗ｅ紑濮嬩綅缃�
- */
- @ApiModelProperty(value= "宸ヤ綔妗ｅ紑濮嬩綅缃�")
- @TableField("wrk_start")
- private Integer wrkStart;
-
- /**
- * 宸ヤ綔妗ｇ粨鏉熶綅缃�
- */
- @ApiModelProperty(value= "宸ヤ綔妗ｇ粨鏉熶綅缃�")
- @TableField("wrk_end")
- private Integer wrkEnd;
-
- /**
- * 灏忚溅鎺ヨ揣浣嶇疆
- */
- @ApiModelProperty(value= "灏忚溅鎺ヨ揣浣嶇疆")
- @TableField("sta_start")
- private Integer staStart;
-
- /**
- * 灏忚溅鏀捐揣浣嶇疆
- */
- @ApiModelProperty(value= "灏忚溅鏀捐揣浣嶇疆")
- @TableField("sta_end")
- private Integer staEnd;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("update_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /**
- * 绫诲瀷 0:闈炵┖ 1:绌烘澘
- */
- @ApiModelProperty(value= "绫诲瀷 1:婊＄増 2:绌烘澘")
- private Integer type;
-
- /**
- * 宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氱瓑寰呭皬杞﹀彇 2锛氱瓑寰呭皬杞︽斁 3锛氬畬鎴�
- */
- @ApiModelProperty(value= "宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氱瓑寰呭皬杞﹀彇 2锛氱瓑寰呭皬杞︽斁 3锛氬畬鎴�")
- @TableField("wrk_sts")
- private Integer wrkSts;
-
- /**
- * 琛屽彿
- */
- @ApiModelProperty(value= "琛屽彿")
- @TableField("line_number")
- private Integer lineNumber;
-
- /**
- * 宸ヤ綔绫诲瀷
- */
- @ApiModelProperty(value= "宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 5锛氭弧鍙� 6锛氭弧鏀�")
- @TableField("wrk_type")
- private Integer wrkType;
-
- /**
- * 宸ヤ綔绫诲瀷
- */
- @ApiModelProperty(value= "宸ヤ綔绫诲瀷")
- @TableField("wrk_crn")
- private Integer wrkCrn;
-
- /**
- * 鏍囪鏃堕棿
- */
- @ApiModelProperty(value= "鏍囪鏃堕棿")
- @TableField("bign_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date bignTime;
-
- public WrkMastSta() {}
-
- public WrkMastSta(Date now, Integer staStart) {
- this.wrkNo = staStart.longValue()+19999;
- this.wrkStart = staStart;
- this.wrkEnd = staStart;
- this.staStart = staStart;
- this.staEnd = staStart;
- this.createTime = now;
- this.updateTime = now;
- this.wrkSts = 0;
- this.bignTime = now;
- }
-
- public WrkMastSta(Long wrkNo, Integer wrkStart, Integer wrkEnd, Integer staStart, Integer staEnd, Date createTime, Date updateTime, Integer type, Integer wrkSts, Integer lineNumber, Integer wrkType, Date bignTime) {
- this.wrkNo = wrkNo;
- this.wrkStart = wrkStart;
- this.wrkEnd = wrkEnd;
- this.staStart = staStart;
- this.staEnd = staEnd;
- this.createTime = createTime;
- this.updateTime = updateTime;
- this.type = type;
- this.wrkSts = wrkSts;
- this.lineNumber = lineNumber;
- this.wrkType = wrkType;
- this.bignTime = bignTime;
- }
-
- public Integer getStaEnd(Integer souSta) {
- switch (souSta) {
- case 100:
- case 103:
- case 106:
- case 109:
- case 112:
- case 115:
- return souSta + 1;
- default:
- return souSta;
- }
- }
-
-// WrkMastSta wrkMastSta = new WrkMastSta(
-// null, // 宸ヤ綔鍙穂闈炵┖]
-// null, // 宸ヤ綔妗ｅ紑濮嬩綅缃甗闈炵┖]
-// null, // 宸ヤ綔妗ｇ粨鏉熶綅缃甗闈炵┖]
-// null, // 灏忚溅鎺ヨ揣浣嶇疆[闈炵┖]
-// null, // 灏忚溅鏀捐揣浣嶇疆[闈炵┖]
-// null, // 娣诲姞鏃堕棿
-// null, // 淇敼鏃堕棿
-// null, // 绫诲瀷 0:闈炵┖ 1:绌烘澘[闈炵┖]
-// null, // 宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氱瓑寰呭皬杞﹀彇 2锛氱瓑寰呭皬杞︽斁 3锛氬畬鎴怺闈炵┖]
-// null, // 琛屽彿[闈炵┖]
-// null, // 宸ヤ綔绫诲瀷[闈炵┖]
-// null // 鏍囪鏃堕棿
-// );
-
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
- public String getBignTime$(){
- if (Cools.isEmpty(this.bignTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.bignTime);
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/BasJarMapper.java b/src/main/java/com/zy/asrs/mapper/BasJarMapper.java
deleted file mode 100644
index f977f4f..0000000
--- a/src/main/java/com/zy/asrs/mapper/BasJarMapper.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.zy.asrs.entity.BasJar;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface BasJarMapper extends BaseMapper<BasJar> {
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/BasJarMastMapper.java b/src/main/java/com/zy/asrs/mapper/BasJarMastMapper.java
deleted file mode 100644
index 65b9ae9..0000000
--- a/src/main/java/com/zy/asrs/mapper/BasJarMastMapper.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.zy.asrs.entity.BasJarMast;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.Date;
-import java.util.List;
-
-@Mapper
-@Repository
-public interface BasJarMastMapper extends BaseMapper<BasJarMast> {
-
- BasJarMast getJarMastByWrkNo(@Param("wrkNo") Long wrkNo);
-
- List<BasJarMast> getJarMastByJarId(@Param("jarId") Integer jarId);
-
- List<BasJarMast> getJarMastByJarIdAndStatusList(@Param("jarId") Integer jarId,@Param("statusList") List<Integer> statusList);
-
- List<BasJarMast> getJarMastByJarIdAndStatusListB(@Param("jarId") Integer jarId,@Param("statusList") List<Integer> statusList);
-
- List<BasJarMast> getJarMastByJarIdAndStatusListCharge(@Param("jarId") Integer jarId,@Param("statusList") List<Integer> statusList);
-
- BasJarMast getJarMastByJarIdMax(@Param("jarId") Integer jarId,@Param("statusList") List<Integer> statusList);
- BasJarMast getJarMastByJarIdMaxB(@Param("jarId") Integer jarId,@Param("statusList") List<Integer> statusList);
-
- BasJarMast getJarMastByJarIdMin(@Param("jarId") Integer jarId,@Param("statusList") List<Integer> statusList);
-
- BasJarMast getJarMastByJarIdMinB(@Param("jarId") Integer jarId,@Param("statusList") List<Integer> statusList);
-
- Integer getJarMastByJarIdCount(@Param("jarId") Integer jarId);
-
- Integer selectJarMastOperationByStatusList(@Param("jarId") Integer jarId,@Param("statusList") List<Integer> statusList);
-
- Integer updateStatus(@Param("jarId") Integer jarId, @Param("status") Integer status, @Param("statusUpdate") Integer statusUpdate);
-
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/BasJarMastStatusMapper.java b/src/main/java/com/zy/asrs/mapper/BasJarMastStatusMapper.java
deleted file mode 100644
index ca52431..0000000
--- a/src/main/java/com/zy/asrs/mapper/BasJarMastStatusMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.zy.asrs.entity.BasJarMastStatus;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface BasJarMastStatusMapper extends BaseMapper<BasJarMastStatus> {
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
deleted file mode 100644
index bc2cd84..0000000
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.zy.asrs.entity.LocDetl;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Map;
-
-@Mapper
-@Repository
-public interface LocDetlMapper extends BaseMapper<LocDetl> {
-
- List<LocDetl> getStockOutPage(Map<String, Object> map);
-
- Integer getStockOutPageCount(Map<String, Object> map);
-
- @Update("update asr_loc_detl set anfme=#{anfme}, modi_time = getDate() where loc_no = #{locNo} and matnr = #{matnr}")
- int updateAnfme(Double anfme, String locNo, String matnr);
-
- @Update("update asr_loc_detl set loc_no = #{newLocNo}, modi_time=getDate() where loc_no = #{oldLocNo}")
- int updateLocNo(String newLocNo, String oldLocNo);
-
- @Select("SELECT ld.loc_no FROM asr_loc_detl ld LEFT JOIN asr_loc_mast lm ON ld.loc_no = lm.loc_no WHERE (1 = 1 AND ld.matnr = #{matnr} AND (lm.row1 >= #{start} AND lm.row1 <= #{end}) AND lm.loc_sts = 'F' AND DateDiff(dd, lm.modi_time, getdate()) = 0) ORDER BY lm.modi_time ASC")
- List<String> selectSameDetlToday(@Param("matnr") String matnr, @Param("start") Integer start, @Param("end") Integer end);
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
deleted file mode 100644
index 9fd1d06..0000000
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ /dev/null
@@ -1,38 +0,0 @@
-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> {
-
-// @Select("select distinct row1 from asr_loc_mast where crn_no = #{crnNo}")
- @Select("select row1 from ( select distinct row1 from asr_loc_mast where crn_no = #{crnNo} ) a " +
- "order by case row1 when 1 then 1 when 2 then 0 when 3 then 0 when 4 then 1 " +
- "when 5 then 1 when 6 then 0 when 7 then 0 when 8 then 1 when 9 then 1 when 10 then 0 " +
- "when 11 then 0 when 12 then 1 when 13 then 1 when 14 then 0 when 15 then 0 when 16 then 1 end desc,newid()")
- List<Integer> queryDistinctRow(@Param("crnNo")Integer crnNo);
-
- LocMast queryFreeLocMast(@Param("row") Integer row, @Param("locType1") Short locType1);
-
- @Select("select loc_no from asr_loc_mast where 1=1 and loc_sts = 'O' and crn_no = #{crnNo}")
- List<String> queryGroupEmptyStock(Integer crnNo);
-
- @Select("select top 1 bay1 from asr_loc_mast order by bay1 desc")
- Short selectTotalBay();
-
- LocMast queryDemoSourceLoc(@Param("crnNo") Integer crnNo);
-
- LocMast queryDemoLoc(@Param("crnNo") Integer crnNo);
-
- @Select("select count(*) as count from asr_loc_mast where 1=1 and loc_sts = 'O' and loc_type1 = #{locType1} and crn_no = #{crnNo}")
- Integer selectEmptyLocCount(@Param("locType1") Short locType1, @Param("crnNo") Integer crnNo);
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/MatCodeMapper.java b/src/main/java/com/zy/asrs/mapper/MatCodeMapper.java
deleted file mode 100644
index a09bd26..0000000
--- a/src/main/java/com/zy/asrs/mapper/MatCodeMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.zy.asrs.entity.MatCode;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface MatCodeMapper extends BaseMapper<MatCode> {
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/RgvOneSignMapper.java b/src/main/java/com/zy/asrs/mapper/RgvOneSignMapper.java
deleted file mode 100644
index 8a038bb..0000000
--- a/src/main/java/com/zy/asrs/mapper/RgvOneSignMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.zy.asrs.entity.RgvOneSign;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface RgvOneSignMapper extends BaseMapper<RgvOneSign> {
-
- RgvOneSign selectOneSign(@Param("sign") String sign);
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/WaitPakinMapper.java b/src/main/java/com/zy/asrs/mapper/WaitPakinMapper.java
deleted file mode 100644
index cbca94b..0000000
--- a/src/main/java/com/zy/asrs/mapper/WaitPakinMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.zy.asrs.entity.WaitPakin;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface WaitPakinMapper extends BaseMapper<WaitPakin> {
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
deleted file mode 100644
index f953518..0000000
--- a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.zy.asrs.entity.WrkDetl;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.Date;
-import java.util.List;
-
-@Mapper
-@Repository
-public interface WrkDetlMapper extends BaseMapper<WrkDetl> {
-
- List<WrkDetl> findByWorkNo(Integer workNo);
-
- int updateIoTime(@Param("workNo") Integer workNo, @Param("ioTime") Date ioTime);
-
- List<WrkDetl> selectByWrkNo(Integer wrkNo);
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastCrnMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastCrnMapper.java
deleted file mode 100644
index 4d40319..0000000
--- a/src/main/java/com/zy/asrs/mapper/WrkMastCrnMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.entity.WrkMastCrn;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface WrkMastCrnMapper extends BaseMapper<WrkMastCrn> {
-
- WrkMastCrn selectWrkNoOneAndTwo(@Param("wrkNo")Integer wrkNo);
-
- WrkMastCrn selectWrkNoCrnAndWrkSts(@Param("crnNo")Integer crnNo,@Param("wrkSts")Integer wrkSts);
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java
deleted file mode 100644
index 75bb7ce..0000000
--- a/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.zy.asrs.entity.WrkMastExecute;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-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 WrkMastExecuteMapper extends BaseMapper<WrkMastExecute> {
-
- WrkMastExecute getWrkMastExecuteByCharge(@Param("steNo") Integer steNo);
-
- WrkMastExecute getWrkMastExecuteByWrkNo(@Param("wrkNo") Long wrkNo);
-
- List<WrkMastExecute> getWrkMastExecuteByWrkNoList(@Param("wrkNo") Long wrkNo);
-
- List<WrkMastExecute> getWrkMastExecuteByJarNo(@Param("jarId") Integer jarId);
-
- List<WrkMastExecute> selectWrkMastExecuteByType(@Param("type") Integer type);
-
- List<WrkMastExecute> selectWrkMastExecuteByTypeAndIoTyperAndWrkType(@Param("type")Integer type,@Param("ioType")Integer ioType,@Param("wrkSts")Integer wrkSts,@Param("jarRegin")Integer jarRegin);
-
- List<WrkMastExecute> selectWrkMastExecuteByWrk(@Param("type")Integer type,@Param("ioType")Integer ioType,
- @Param("wrkSts")Integer wrkSts,@Param("steNo")Integer steNo,
- @Param("jarNo")Integer jarNo,@Param("rgvNo")Integer rgvNo);
-
-
- Integer getWrkMastExecuteByJarIdCount(@Param("jarId") Integer jarId);
- Integer getWrkMastExecuteByjarReginCount(@Param("jarRegin") Integer jarId);
-
- Integer selectNoStart(@Param("jarRegin") Integer jarRegin);
- Integer selectNoStartCharge(@Param("jarRegin") Integer jarRegin);
-
- Integer selectMoveStart(@Param("jarRegin") Integer jarRegin);
-
- Integer selectMoveStartCharge(@Param("jarRegin") Integer jarRegin);
-
- WrkMastExecute selectStart(@Param("jarRegin") Integer jarRegin);
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastSplitTwinMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastSplitTwinMapper.java
deleted file mode 100644
index c6ef289..0000000
--- a/src/main/java/com/zy/asrs/mapper/WrkMastSplitTwinMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.zy.asrs.entity.WrkMastSplitTwin;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-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 WrkMastSplitTwinMapper extends BaseMapper<WrkMastSplitTwin> {
-
- List<WrkMastSplitTwin> getWrkMastSplitTwin(@Param("crnNo")Integer crnNo, @Param("type")Integer type, @Param("ioType")Integer ioType, @Param("wrkType")Integer wrkType, @Param("wrkSts")Integer wrkSts);
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java
deleted file mode 100644
index 7ece0f1..0000000
--- a/src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.zy.asrs.entity.WrkMastSta;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.Date;
-import java.util.List;
-
-@Mapper
-@Repository
-public interface WrkMastStaMapper extends BaseMapper<WrkMastSta> {
-
- /*
- * 鑾峰彇鎵�鏈変换鍔℃暟閲�
- * */
- Integer selectAllWrkCount(@Param("type")Integer type);
- Integer selectAllWrkStsCount(@Param("type")Integer type,@Param("wrkSts")Integer wrkSts);
-
- /*
- * 鑾峰彇鎵�鏈夊彲鎵ц浠诲姟
- * */
- List<WrkMastSta> selectAllWrkMastStaList(@Param("type")Integer type);
-
- /*
- * 鏌ヨ鎸囧畾宸ヤ綔鍙蜂换鍔�
- * */
- WrkMastSta selectByWrkNo(@Param("workNo") Long workNo);
-
- /*
- * 鏌ヨ涓嶅共娑夌殑鍙墽琛屼换鍔�
- * */
- WrkMastSta selectNoInterfere(@Param("staStarts") List<Integer> staStarts,@Param("staEnds") List<Integer> staEnds);
- List<WrkMastSta> selectNoInterfereList(@Param("staStarts") List<Integer> staStarts,@Param("staEnds") List<Integer> staEnds);
-
-}
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
deleted file mode 100644
index 737a98c..0000000
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.zy.asrs.service;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.IService;
-import com.zy.asrs.entity.LocDetl;
-
-import java.util.List;
-
-public interface LocDetlService extends IService<LocDetl> {
-
- Page<LocDetl> getStockOut(Page<LocDetl> page);
-
- /**
- * 淇敼搴撳瓨鏄庣粏鏁伴噺锛屽鏋滄暟閲忎负0锛屽垯鍒犻櫎璁板綍
- */
- boolean updateAnfme(Double anfme, String locNo, String matnr);
-
- boolean updateLocNo(String newLocNo, String oldLocNo);
-
- /**
- * 鑾峰彇褰撳ぉ鐩稿悓瑙勬牸璐х墿鐨勬繁搴撲綅鍙�
- * @param matnr 鐗╂枡鍙�
- * @return locNo 搴撲綅鍙�
- */
- List<String> getSameDetlToday(String matnr, Integer start, Integer end);
-
-}
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
deleted file mode 100644
index bc45966..0000000
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ /dev/null
@@ -1,49 +0,0 @@
-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> {
-
- /**
- * 鍫嗗灈鏈哄搴旂殑鎺掑彿闆嗗悎
- */
- List<Integer> queryDistinctRow(Integer crnNo);
-
- /**
- * 妫�绱㈠彲鐢ㄥ簱浣�
- */
- LocMast queryFreeLocMast(Integer row, Short locType1);
-
- /**
- * 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅
- * @param sourceLocNo 婧愬簱浣�
- * @return 鍚岀粍绌哄簱浣嶉泦鍚�
- */
- List<String> queryGroupEmptyStock(String sourceLocNo);
-
- /**
- * 鍫嗗灈鏈烘紨绀鸿幏鍙栨簮搴撲綅
- * @param crn
- * @return
- */
- LocMast queryDemoSourceLoc(Integer crn);
-
- /**
- * 鍫嗗灈鏈烘紨绀鸿幏鍙栫洰鏍囧簱浣�
- * @param crn
- * @return
- */
- LocMast queryDemoLoc(Integer crn);
-
- /**
- * 妫�鏌ュ綋鍓嶅簱浣嶆墍灞炲贩閬撶殑绌哄簱浣嶆暟閲�
- * @param locMast
- * @return
- */
- Boolean checkEmptyCount(LocMast locMast);
-
-
-}
diff --git a/src/main/java/com/zy/asrs/service/MatCodeService.java b/src/main/java/com/zy/asrs/service/MatCodeService.java
deleted file mode 100644
index 0f78ed5..0000000
--- a/src/main/java/com/zy/asrs/service/MatCodeService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.service;
-
-import com.baomidou.mybatisplus.service.IService;
-import com.zy.asrs.entity.MatCode;
-
-public interface MatCodeService extends IService<MatCode> {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/WrkDetlService.java b/src/main/java/com/zy/asrs/service/WrkDetlService.java
deleted file mode 100644
index 81d4e92..0000000
--- a/src/main/java/com/zy/asrs/service/WrkDetlService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.zy.asrs.service;
-
-import com.baomidou.mybatisplus.service.IService;
-import com.zy.asrs.entity.WaitPakin;
-import com.zy.asrs.entity.WrkDetl;
-
-import java.util.Date;
-import java.util.List;
-
-public interface WrkDetlService extends IService<WrkDetl> {
-
- void createWorkDetail(Integer workNo, List<WaitPakin> waitPakins, String barcode);
-
- List<WrkDetl> findByWorkNo(Integer workNo);
-
- boolean updateIoTime(Integer workNo, Date ioTime);
-
- List<WrkDetl> selectByWrkNo(Integer wrkNo);
-
-}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastExecuteService.java b/src/main/java/com/zy/asrs/service/WrkMastExecuteService.java
deleted file mode 100644
index fe3dc9a..0000000
--- a/src/main/java/com/zy/asrs/service/WrkMastExecuteService.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.zy.asrs.service;
-
-import com.zy.asrs.entity.WrkMastExecute;
-import com.baomidou.mybatisplus.service.IService;
-
-import java.util.List;
-
-public interface WrkMastExecuteService extends IService<WrkMastExecute> {
-
- WrkMastExecute getWrkMastExecuteByCharge(Integer steNo);
-
- WrkMastExecute getWrkMastExecuteByWrkNo(Long wrkNo);
-
- List<WrkMastExecute> getWrkMastExecuteByWrkNoList(Long wrkNo);
-
- List<WrkMastExecute> getWrkMastExecuteByJarNo(Integer jarId);
-
- List<WrkMastExecute> selectWrkMastExecuteByType(Integer type);
-
- List<WrkMastExecute> selectWrkMastExecuteByTypeAndIoTyperAndWrkType(Integer type,Integer ioType,Integer wrkSts);
- List<WrkMastExecute> selectWrkMastExecuteByTypeAndIoTyperAndWrkType(Integer type,Integer ioType,Integer wrkSts,Integer jarRegin);
-
- List<WrkMastExecute> selectWrkMastExecuteByWrk(WrkMastExecute wrkMastExecute);
-
- Integer getWrkMastExecuteByJarIdCount(Integer jarId);
- Integer getWrkMastExecuteByjarReginCount(Integer jarId);
-
- Integer selectNoStart(Integer jarRegin);
-
- Integer selectNoStartCharge(Integer jarRegin);
-
- Integer selectMoveStart(Integer jarRegin);
-
- Integer selectMoveStartCharge(Integer jarRegin);
-
- WrkMastExecute selectStart(Integer jarRegin);
-
-}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastSplitTwinService.java b/src/main/java/com/zy/asrs/service/WrkMastSplitTwinService.java
deleted file mode 100644
index 66cfd04..0000000
--- a/src/main/java/com/zy/asrs/service/WrkMastSplitTwinService.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.zy.asrs.service;
-
-import com.zy.asrs.entity.WrkMastSplitTwin;
-import com.baomidou.mybatisplus.service.IService;
-
-import java.util.List;
-
-public interface WrkMastSplitTwinService extends IService<WrkMastSplitTwin> {
-
- List<WrkMastSplitTwin> getWrkMastSplitTwin(Integer crnNo,Integer crnStation,Integer ioType,Integer type,Integer wrkSts);
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
deleted file mode 100644
index 57f3645..0000000
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.mapper.LocDetlMapper;
-import com.zy.asrs.service.LocDetlService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service("locDetlService")
-public class LocDetlServiceImpl extends ServiceImpl<LocDetlMapper, LocDetl> implements LocDetlService {
-
- @Override
- public Page<LocDetl> getStockOut(Page<LocDetl> page) {
- page.setRecords(baseMapper.getStockOutPage(page.getCondition()));
- page.setTotal(baseMapper.getStockOutPageCount(page.getCondition()));
- return page;
- }
-
- @Override
- public boolean updateAnfme(Double anfme, String locNo, String matnr) {
- if (anfme <= 0) {
- return delete(new EntityWrapper<LocDetl>().eq("loc_no", locNo).eq("matnr", matnr));
- } else {
- int res = baseMapper.updateAnfme(anfme, locNo, matnr);
- return res > 0;
- }
- }
-
- @Override
- public boolean updateLocNo(String newLocNo, String oldLocNo) {
- return baseMapper.updateLocNo(newLocNo, oldLocNo) > 0;
- }
-
- @Override
- public List<String> getSameDetlToday(String matnr, Integer start, Integer end) {
- return this.baseMapper.selectSameDetlToday(matnr, start, end);
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
deleted file mode 100644
index ababf93..0000000
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ /dev/null
@@ -1,55 +0,0 @@
-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 List<Integer> queryDistinctRow(Integer crnNo) {
- return this.baseMapper.queryDistinctRow(crnNo);
- }
-
- @Override
- public LocMast queryFreeLocMast(Integer row, Short locType1) {
- return this.baseMapper.queryFreeLocMast(row, locType1);
- }
-
- @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());
- }
-
- @Override
- public LocMast queryDemoSourceLoc(Integer crn) {
- return this.baseMapper.queryDemoSourceLoc(crn);
- }
-
- @Override
- public LocMast queryDemoLoc(Integer crn) {
- return this.baseMapper.queryDemoLoc(crn);
- }
-
- @Override
- public Boolean checkEmptyCount(LocMast locMast) {
- if (locMast == null) {
- return false;
- }
- return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 1;
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/MatCodeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MatCodeServiceImpl.java
deleted file mode 100644
index 72ae4e0..0000000
--- a/src/main/java/com/zy/asrs/service/impl/MatCodeServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.zy.asrs.entity.MatCode;
-import com.zy.asrs.mapper.MatCodeMapper;
-import com.zy.asrs.service.MatCodeService;
-import org.springframework.stereotype.Service;
-
-@Service("matCodeService")
-public class MatCodeServiceImpl extends ServiceImpl<MatCodeMapper, MatCode> implements MatCodeService {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
deleted file mode 100644
index a9d4e40..0000000
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ /dev/null
@@ -1,65 +0,0 @@
-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.MatCode;
-import com.zy.asrs.entity.WaitPakin;
-import com.zy.asrs.entity.WrkDetl;
-import com.zy.asrs.mapper.WrkDetlMapper;
-import com.zy.asrs.service.MatCodeService;
-import com.zy.asrs.service.WrkDetlService;
-import com.zy.asrs.utils.VersionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-import java.util.List;
-
-@Service("wrkDetlService")
-public class WrkDetlServiceImpl extends ServiceImpl<WrkDetlMapper, WrkDetl> implements WrkDetlService {
-
- @Autowired
- private MatCodeService matCodeService;
-
- @Override
- @Transactional
- public void createWorkDetail(Integer workNo, List<WaitPakin> waitPakins, String barcode) {
- if (waitPakins.isEmpty()){
- return;
- }
- for (WaitPakin waitPakin : waitPakins) {
- MatCode matCode = matCodeService.selectById(waitPakin.getMatnr());
- if (Cools.isEmpty(matCode)){
- throw new CoolException("鐗╂枡鏉＄爜鏁版嵁涓虹┖");
- }
- // 淇濇寔宸ヤ綔妗ｆ槑缁�
- WrkDetl wrkDetl = new WrkDetl();
- wrkDetl.setWrkNo(workNo);
- wrkDetl.setIoTime(new Date());
- VersionUtils.setWrkDetl(wrkDetl, matCode); // 鐗堟湰鎺у埗
- wrkDetl.setZpallet(barcode); // 鎵樼洏鏉＄爜
- wrkDetl.setAppeTime(new Date());
- wrkDetl.setModiTime(new Date());
- if (!this.insert(wrkDetl)) {
- throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
- }
- }
- }
-
- @Override
- public List<WrkDetl> findByWorkNo(Integer workNo) {
- return this.baseMapper.findByWorkNo(workNo);
- }
-
- @Override
- public boolean updateIoTime(Integer workNo, Date ioTime) {
- return this.baseMapper.updateIoTime(workNo, ioTime) > 0;
- }
-
- @Override
- public List<WrkDetl> selectByWrkNo(Integer wrkNo) {
- return this.baseMapper.selectByWrkNo(wrkNo);
- }
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java
deleted file mode 100644
index 6b05400..0000000
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.zy.asrs.mapper.WrkMastExecuteMapper;
-import com.zy.asrs.entity.WrkMastExecute;
-import com.zy.asrs.service.WrkMastExecuteService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service("wrkMastExecuteService")
-public class WrkMastExecuteServiceImpl extends ServiceImpl<WrkMastExecuteMapper, WrkMastExecute> implements WrkMastExecuteService {
-
- @Override
- public WrkMastExecute getWrkMastExecuteByCharge(Integer steNo) {
- return this.baseMapper.getWrkMastExecuteByCharge(steNo);
- }
-
- @Override
- public WrkMastExecute getWrkMastExecuteByWrkNo(Long wrkNo) {
- return this.baseMapper.getWrkMastExecuteByWrkNo(wrkNo);
- }
-
- @Override
- public List<WrkMastExecute> getWrkMastExecuteByWrkNoList(Long wrkNo) {
- return this.baseMapper.getWrkMastExecuteByWrkNoList(wrkNo);
- }
-
- @Override
- public List<WrkMastExecute> getWrkMastExecuteByJarNo(Integer jarId) {
- return this.baseMapper.getWrkMastExecuteByJarNo(jarId);
- }
-
- @Override
- public List<WrkMastExecute> selectWrkMastExecuteByType(Integer type) {
- return this.baseMapper.selectWrkMastExecuteByType(type);
- }
- @Override
- public List<WrkMastExecute> selectWrkMastExecuteByTypeAndIoTyperAndWrkType(Integer type,Integer ioType,Integer wrkSts) {
- return this.baseMapper.selectWrkMastExecuteByTypeAndIoTyperAndWrkType(type,ioType,wrkSts,null);
- }
-
- @Override
- public List<WrkMastExecute> selectWrkMastExecuteByTypeAndIoTyperAndWrkType(Integer type,Integer ioType,Integer wrkSts,Integer jarRegin) {
- return this.baseMapper.selectWrkMastExecuteByTypeAndIoTyperAndWrkType(type,ioType,wrkSts,jarRegin);
- }
-
- @Override
- public List<WrkMastExecute> selectWrkMastExecuteByWrk(WrkMastExecute wrkMastExecute) {
- return this.baseMapper.selectWrkMastExecuteByWrk(wrkMastExecute.getType(),wrkMastExecute.getIoType(),wrkMastExecute.getWrkSts(),wrkMastExecute.getSteId(),wrkMastExecute.getJarId(),wrkMastExecute.getRgvId());
- }
-
- @Override
- public Integer getWrkMastExecuteByJarIdCount(Integer jarId) {
- return this.baseMapper.getWrkMastExecuteByJarIdCount(jarId);
- }
-
- @Override
- public Integer getWrkMastExecuteByjarReginCount(Integer jarId) {
- return this.baseMapper.getWrkMastExecuteByjarReginCount(jarId);
- }
-
- @Override
- public Integer selectNoStart(Integer jarRegin) {
- return this.baseMapper.selectNoStart(jarRegin);
- }
- @Override
- public Integer selectNoStartCharge(Integer jarRegin) {
- return this.baseMapper.selectNoStartCharge(jarRegin);
- }
-
- @Override
- public Integer selectMoveStart(Integer jarRegin) {
- return this.baseMapper.selectMoveStart(jarRegin);
- }
-
- @Override
- public Integer selectMoveStartCharge(Integer jarRegin) {
- return this.baseMapper.selectMoveStartCharge(jarRegin);
- }
-
- @Override
- public WrkMastExecute selectStart(Integer jarRegin) {
- return this.baseMapper.selectStart(jarRegin);
- }
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastSplitTwinServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastSplitTwinServiceImpl.java
deleted file mode 100644
index 8c9a205..0000000
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastSplitTwinServiceImpl.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.zy.asrs.mapper.WrkMastSplitTwinMapper;
-import com.zy.asrs.entity.WrkMastSplitTwin;
-import com.zy.asrs.service.WrkMastSplitTwinService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service("wrkMastSplitTwinService")
-public class WrkMastSplitTwinServiceImpl extends ServiceImpl<WrkMastSplitTwinMapper, WrkMastSplitTwin> implements WrkMastSplitTwinService {
- @Override
- public List<WrkMastSplitTwin> getWrkMastSplitTwin(Integer crnNo,Integer crnStation,Integer ioType,Integer type,Integer wrkSts) {
- return this.baseMapper.getWrkMastSplitTwin(crnNo,crnStation,ioType,type,wrkSts);
- }
-}
diff --git a/src/main/java/com/zy/asrs/task/escalationParam/ScaleEscalationParam.java b/src/main/java/com/zy/asrs/task/escalationParam/ScaleEscalationParam.java
index 204f6f8..2d6744c 100644
--- a/src/main/java/com/zy/asrs/task/escalationParam/ScaleEscalationParam.java
+++ b/src/main/java/com/zy/asrs/task/escalationParam/ScaleEscalationParam.java
@@ -1,12 +1,6 @@
package com.zy.asrs.task.escalationParam;
-import com.zy.asrs.entity.WrkDetl;
-import com.zy.asrs.entity.WrkMast;
import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
/*
* Created by Monkey D. Luffy on 2023.07.19
diff --git a/src/main/java/com/zy/asrs/task/escalationParam/StaEscalationParam.java b/src/main/java/com/zy/asrs/task/escalationParam/StaEscalationParam.java
index c0d864a..0bd36a3 100644
--- a/src/main/java/com/zy/asrs/task/escalationParam/StaEscalationParam.java
+++ b/src/main/java/com/zy/asrs/task/escalationParam/StaEscalationParam.java
@@ -1,12 +1,6 @@
package com.zy.asrs.task.escalationParam;
-import com.zy.asrs.entity.WrkDetl;
-import com.zy.asrs.entity.WrkMast;
import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
/*
* Created by Monkey D. Luffy on 2023.07.19
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
deleted file mode 100644
index 0e8be1f..0000000
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.zy.asrs.utils;
-
-import com.core.exception.CoolException;
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.entity.MatCode;
-import com.zy.asrs.entity.WrkDetl;
-import com.zy.common.model.LocTypeDto;
-
-/**
- * Created by vincent on 2020/7/14
- */
-public class VersionUtils {
-
- // 涓氬姟 ----------------------------------------------------------------------
-
- public static void setWrkDetl(WrkDetl wrkDetl, MatCode matCode) {
-// wrkDetl.setMatNo(matCode.getMatNo()); // 鐗╂枡缂栧彿
-// wrkDetl.setMatName(matCode.getMatName()); // 鐗╂枡鎻忚堪
-// wrkDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
-// wrkDetl.setType(matCode.getStr5()); // 鍨嬪彿
-// wrkDetl.setColor(matCode.getBarcode()); // 鏉＄爜
-// wrkDetl.setSupplier(matCode.getStr6()); // 鎵瑰彿
-// wrkDetl.setWarehouse(matCode.getStr7()); // 鍗曟嵁缂栧彿
-// wrkDetl.setBrand(matCode.getStr3()); // 鍝侀」鏁�
-// wrkDetl.setAltme(matCode.getStr1()); // 鍗曚綅
-// wrkDetl.setBname(matCode.getStr4()); // 瀹㈡埛鍚嶇О
- }
-
- public static void setWrkDetl(WrkDetl wrkDetl, LocDetl locDetl) {
- wrkDetl.setMatnr(locDetl.getMatnr()); // 浜у搧缂栧彿
- wrkDetl.setMaktx(locDetl.getMaktx()); // 浜у搧鎻忚堪
- wrkDetl.setSpecs(locDetl.getSpecs()); // 瑙勬牸
- wrkDetl.setUnit(locDetl.getUnit()); // 鍗曚綅
-// wrkDetl.setSize(locDetl.getSize()); // 灏哄
- wrkDetl.setColor(locDetl.getColor()); // 棰滆壊
- wrkDetl.setWeight(locDetl.getWeight()); // 鍗曢噸
- wrkDetl.setZpallet(locDetl.getZpallet()); // 鎵樼洏鏉＄爜
- }
-
- public static void setLocDetl(LocDetl locDetl, MatCode matCode) {
-// locDetl.setMatNo(matCode.getMatNo()); // 鐗╂枡缂栧彿
-// locDetl.setMatName(matCode.getMatName()); // 鐗╂枡鎻忚堪
-// locDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
-// locDetl.setType(matCode.getStr5()); // 鍨嬪彿
-// locDetl.setColor(matCode.getBarcode()); // 鏉＄爜
-// locDetl.setSupplier(matCode.getStr6()); // 鎵瑰彿
-// locDetl.setWarehouse(matCode.getStr7()); // 鍗曟嵁缂栧彿
-// locDetl.setBrand(matCode.getStr3()); // 鍝侀」鏁�
-// locDetl.setAltme(matCode.getStr1()); // 鍗曚綅
-// locDetl.setBname(matCode.getStr4()); // 瀹㈡埛鍚嶇О
- }
-
- public static void setLocDetl(LocDetl locDetl, WrkDetl wrkDetl) {
- locDetl.setMatnr(wrkDetl.getMatnr()); // 浜у搧缂栧彿
- locDetl.setMaktx(wrkDetl.getMaktx()); // 浜у搧鎻忚堪
- locDetl.setSpecs(wrkDetl.getSpecs()); // 瑙勬牸
- locDetl.setUnit(wrkDetl.getUnit()); // 鍗曚綅
-// locDetl.setSize(wrkDetl.getSize()); // 灏哄
- locDetl.setColor(wrkDetl.getColor()); // 棰滆壊
- locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
- locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
- }
-
- /**
- * 搴撲綅绉昏浆鏃剁被鍨嬫娴�
- **/
- public static void locMoveCheckLocType(LocMast sourceLoc, LocMast loc){
- // 濡傛灉婧愬簱浣嶆槸楂樺簱浣嶏紝鐩爣搴撲綅鏄綆搴撲綅
-// if (sourceLoc.getLocType1() == 2 && loc.getLocType1() == 1) {
-// throw new CoolException("楂樺簱浣嶄笉鑳界Щ杞嚦浣庡簱浣�");
-// }
- }
-
- /**
- * 搴撲綅绉昏浆鏃剁被鍨嬫娴�
- **/
- public static boolean locMoveCheckLocType(LocMast loc, LocTypeDto dto){
-
- return true;
- }
-
-
-}
diff --git a/src/main/java/com/zy/common/model/MatDto.java b/src/main/java/com/zy/common/model/MatDto.java
index 2d90d5c..79f64da 100644
--- a/src/main/java/com/zy/common/model/MatDto.java
+++ b/src/main/java/com/zy/common/model/MatDto.java
@@ -1,6 +1,5 @@
package com.zy.common.model;
-import com.zy.asrs.entity.WrkDetl;
import lombok.Data;
/**
@@ -49,23 +48,5 @@
this.maknx = maknx;
this.count = count;
this.specs = specs;
- }
- public MatDto(WrkDetl wrkDetl) {
- try{
- this.matNo = wrkDetl.getMatnr();
- this.matnr = wrkDetl.getMatnr();
- this.maknx = wrkDetl.getMaktx();
- this.specs = wrkDetl.getSpecs();
- this.batch = wrkDetl.getBatch();
- this.model = wrkDetl.getModel();
- this.price = wrkDetl.getPrice().toString();
-// this.juanNo = wrkDetl.getSku();
- this.count = wrkDetl.getAnfme();
- this.weight = wrkDetl.getWeight();
- this.volume = wrkDetl.getVolume();
- this.orderNo = wrkDetl.getOrderNo();
- } catch (Exception e){
- System.out.println("寮傚父MatDto68");
- }
}
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 8589343..9057871 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -1,25 +1,13 @@
package com.zy.common.service;
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.core.common.Arith;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
-import com.zy.asrs.utils.Utils;
-import com.zy.asrs.utils.VersionUtils;
-import com.zy.common.model.LocTypeDto;
-import com.zy.common.model.Shelves;
-import com.zy.common.model.StartupDto;
import com.zy.core.properties.SlaveProperties;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
/**
* 璐ф灦鏍稿績鍔熻兘
@@ -33,18 +21,6 @@
private WrkMastService wrkMastService;
@Autowired
private WrkLastnoService wrkLastnoService;
- @Autowired
- private RowLastnoService rowLastnoService;
- @Autowired
- private StaDescService staDescService;
- @Autowired
- private BasDevpService basDevpService;
- @Autowired
- private LocMastService locMastService;
- @Autowired
- private SlaveProperties slaveProperties;
- @Autowired
- private LocDetlService locDetlService;
/**
* 鐢熸垚宸ヤ綔鍙�
diff --git a/src/main/java/com/zy/common/service/WmsService.java b/src/main/java/com/zy/common/service/WmsService.java
index d188461..fea87fa 100644
--- a/src/main/java/com/zy/common/service/WmsService.java
+++ b/src/main/java/com/zy/common/service/WmsService.java
@@ -1,7 +1,6 @@
package com.zy.common.service;
import com.alibaba.fastjson.JSON;
-import com.zy.asrs.entity.WaitPakin;
import com.zy.common.utils.HttpHandler;
import com.zy.core.properties.SystemProperties;
import lombok.extern.slf4j.Slf4j;
@@ -19,32 +18,5 @@
@Slf4j
@Service
public class WmsService {
-
- public boolean fullStorePutStart(String barcode, Integer sourceStaNo, List<WaitPakin> waitPakins) {
-
- try {
- Map<String, Object> param = new HashMap<>();
- param.put("barcode", barcode);
- param.put("devpNo", sourceStaNo);
- List<Map<String, Object>> list = new ArrayList<>();
- for (WaitPakin waitPakin : waitPakins) {
- Map<String, Object> mat = new HashMap<>();
- mat.put("matNo", waitPakin.getMatnr());
- mat.put("count", waitPakin.getAnfme());
- list.add(mat);
- }
- param.put("list", list);
-
- String response = new HttpHandler.Builder()
- .setUri(SystemProperties.WMS_URL)
- .setPath("/full/store/put/start")
- .setJson(JSON.toJSONString(param))
- .build()
- .doPost();
- } catch (IOException e) {
-
- }
- return true;
- }
}
diff --git a/src/main/java/com/zy/common/utils/RgvUtils.java b/src/main/java/com/zy/common/utils/RgvUtils.java
deleted file mode 100644
index 972607b..0000000
--- a/src/main/java/com/zy/common/utils/RgvUtils.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.zy.common.utils;
-
-import com.alibaba.fastjson.JSON;
-import com.core.common.SpringUtils;
-import com.zy.asrs.entity.RgvNode;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class RgvUtils {
-
- //鍒ゆ柇琛岃蛋璺緞鏄惁琚崰鐢�
- public static boolean isPathUsed(Integer startPath,Integer endPath) {
- RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
- Object data = redisUtil.get("rgv_map");
- List<RgvNode> rgvNodes = JSON.parseArray(data.toString(), RgvNode.class);//瀹炴椂鍦板浘
- List<RgvNode> pathList = getPathList(startPath, endPath);//閫氳繃璧风偣鍜岀洰鏍囩偣鑾峰彇琛岃蛋璺緞
- //鎻愬彇鍙楁帶璺緞
- ArrayList<Integer> list = new ArrayList<>();
- for (RgvNode rgvNode : pathList) {
- //鍒ゆ柇璺緞鏄惁琚崰鐢�
- if (rgvNode.getPath().equals(startPath)) {
- //璧风偣璺緞涓嶇撼鍏ヨ绠楄寖鍥�
- continue;
- }
- list.add(rgvNode.getPath());
- }
-
- for (RgvNode node : rgvNodes) {//閬嶅巻瀹炴椂鍦板浘
- if (list.contains(node.getPath())) {
- //璺緞鐩稿悓锛屽垽鏂槸鍚﹁鍗犵敤
- if (node.getLock()) {
- return true;//鍙鏈変竴鏉¤矾寰勮鍗犵敤锛屾暣浣撹矾鍧囦笉鍙敤
- }
- }
- }
-
- return false;
- }
-
- //閿佸畾/瑙ｉ攣璺緞
- public static void lockPath(Integer startPath, Integer endPath, Integer rgvNo, Integer wrkNo, boolean lock) {
- List<RgvNode> pathList = getPathList(startPath, endPath);//閫氳繃璧风偣鍜岀洰鏍囩偣鑾峰彇琛岃蛋璺緞
- lockPath(pathList, rgvNo, wrkNo, lock);
- }
-
- //閿佸畾/瑙ｉ攣璺緞
- public static void lockPath(List<RgvNode> pathList, Integer rgvNo, Integer wrkNo, boolean lock) {
- RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
- Object data = redisUtil.get("rgv_map");
- List<RgvNode> rgvNodes = JSON.parseArray(data.toString(), RgvNode.class);//瀹炴椂鍦板浘
- ArrayList<Integer> list = new ArrayList<>();
- for (RgvNode rgvNode : pathList) {//鎻愬彇鍙楁帶璺緞
- list.add(rgvNode.getPath());
- }
-
- for (RgvNode rgvNode : rgvNodes) {//閬嶅巻瀹炴椂鍦板浘
- if (list.contains(rgvNode.getPath())) {
- //璺緞鐩稿悓
- if (lock) {
- rgvNode.setLock(true);//閿佸畾
- rgvNode.setRgvNo(rgvNo);//RGV鍙�
- rgvNode.setWrkNo(wrkNo);//宸ヤ綔鍙�
- } else {
- rgvNode.setLock(false);//瑙ｉ攣
- rgvNode.setRgvNo(0);
- rgvNode.setRgvNo(0);
- }
- }
- }
- }
-
- //瑙ｉ攣璺緞锛岄�氳繃RGV鍙疯繘琛岃В閿併�傛敞鎰忥細璋冪敤姝ゆ柟娉曚細瑙ｉ攣RGV鍙峰搴旇溅杈嗗叏閮ㄨ矾寰�
- public static void unLockPath(Integer rgvNo) {
- RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
- Object data = redisUtil.get("rgv_map");
- List<RgvNode> rgvNodes = JSON.parseArray(data.toString(), RgvNode.class);//瀹炴椂鍦板浘
- for (RgvNode rgvNode : rgvNodes) {//閬嶅巻瀹炴椂鍦板浘
- if (rgvNode.getRgvNo().equals(rgvNo)) {
- //RGV鍙风浉鍚�
- rgvNode.setLock(false);//瑙ｉ攣
- rgvNode.setRgvNo(0);
- }
- }
- }
-
- //閫氳繃璧风偣鍜岀洰鏍囩偣鑾峰彇琛岃蛋璺緞
- public static List<RgvNode> getPathList(Integer startPath, Integer endPath) {
- int result = startPath - endPath;
- ArrayList<RgvNode> list = new ArrayList<>();
- if (result == 0) {
- list.add(new RgvNode(startPath));
- return list;
- }
-
- if (result > 0) {
- //璧风偣 - 鐩爣鐐� > 0 姝ｆ柟鍚�
- for (int i = startPath; i >= endPath; i--) {
- list.add(new RgvNode(i));
- }
- }else {
- //璧风偣 = 鐩爣鐐� < 0 璐熸柟鍚�
- for (int i = startPath; i <= endPath; i++) {
- list.add(new RgvNode(i));
- }
- }
- return list;
- }
-
- public static void main(String[] args) {
- System.out.println(getPathList(5,5));
- }
-
-}
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index f7c937a..71d10d5 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -29,8 +29,6 @@
@Autowired
private MainProcess mainProcess;
- int CRN_COUNT = 0;
-
/**
* PostConstruct浼氬湪鍔犺浇servlet鐨勬椂鍊欒繍琛屼竴娆�
diff --git a/src/main/java/com/zy/core/model/CrnSlave.java b/src/main/java/com/zy/core/model/CrnSlave.java
deleted file mode 100644
index 29f843e..0000000
--- a/src/main/java/com/zy/core/model/CrnSlave.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.zy.core.model;
-
-import com.zy.core.Slave;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by vincent on 2020/8/10
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class CrnSlave extends Slave {
-
- private Integer rack;
-
- private Integer slot;
-
- private Integer offset;
-
- private Boolean demo;
-
- // 鍫嗗灈鏈哄叆搴撶珯鐐�
- private List<CrnStn> crnInStn = new ArrayList<>();
-
- // 鍫嗗灈鏈哄嚭搴撶珯鐐�
- private List<CrnStn> crnOutStn = new ArrayList<>();
-
- @Data
- public static class CrnStn {
-
- // 杈撻�佺嚎plc缂栧彿
- private Integer devpPlcId;
-
- // 鍫嗗灈鏈虹珯鐐圭紪鍙�
- private Integer staNo;
-
- // 鍫嗗灈鏈虹珯鐐圭紪鍙�
- private Integer staNoOther;
- private Integer staNoOther1;
- private Integer staNoOther2;
-
- // 鎺�
- private Integer row;
-
- // 鍒�
- private Integer bay;
-
- // 灞�
- private Integer lev;
-
- }
-
-}
diff --git a/src/main/java/com/zy/core/model/JarSlave.java b/src/main/java/com/zy/core/model/JarSlave.java
deleted file mode 100644
index 52ba4a9..0000000
--- a/src/main/java/com/zy/core/model/JarSlave.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.zy.core.model;
-
-import com.zy.core.Slave;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by vincent on 2020/8/10
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class JarSlave extends Slave {
-
- private Integer rack;
-
- private Integer slot;
-
- private Boolean demo;
-
- private Integer jarOtherId;
-
- // 纭寲缃愬叆搴撶珯鐐�
- private List<StaStn> jarInSta = new ArrayList<>();
-
- // 纭寲缃愬嚭搴撶珯鐐�
- private List<StaStn> jarOutSta = new ArrayList<>();
-
- // 纭寲缃愬叆搴揜GV
- private List<RgvStn> jarInRgv = new ArrayList<>();
-
- // 纭寲缃愬嚭搴揜GV
- private List<RgvStn> jarOutRgv = new ArrayList<>();
-
- // 纭寲缃愬叆搴撶┛姊澘
- private List<SteStn> jarInSte = new ArrayList<>();
-
- // 纭寲缃愬嚭搴撶┛姊澘
- private List<SteStn> jarOutSte = new ArrayList<>();
-
- @Data
- public static class StaStn {
-
- // 杈撻�佺嚎plc缂栧彿
- private Integer devpPlcId;
-
- // 绌挎杞︾珯鐐圭紪鍙�
- private Integer staNo;
- private Integer rgvNo;
- private Integer steNo;
-
- // 鎺�
- private Integer row;
-
- // 鍒�
- private Integer bay;
-
- // 灞�
- private Integer lev;
-
- }
-
- @Data
- public static class RgvStn {
- // 杈撻�佺嚎plc缂栧彿
- private Integer devpPlcId;
-
- // 绌挎杞︾珯鐐圭紪鍙�
- private Integer rgvNo;
-
- // 鎺�
- private Integer row;
-
- // 鍒�
- private Integer bay;
-
- // 灞�
- private Integer lev;
-
- }
-
- @Data
- public static class SteStn {
- // 杈撻�佺嚎plc缂栧彿
- private Integer devpPlcId;
-
- // 绌挎鏉縫lc缂栧彿
- private Integer steId;
-
- // 绌挎杞︾珯鐐圭紪鍙�
- private Integer steNo;
-
- // 鎺�
- private Integer row;
-
- // 鍒�
- private Integer bay;
-
- // 灞�
- private Integer lev;
-
- }
-
-}
diff --git a/src/main/java/com/zy/core/model/protocol/JarProtocol.java b/src/main/java/com/zy/core/model/protocol/JarProtocol.java
deleted file mode 100644
index 9fdd2cb..0000000
--- a/src/main/java/com/zy/core/model/protocol/JarProtocol.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package com.zy.core.model.protocol;
-
-import com.zy.asrs.entity.BasJar;
-import com.zy.core.enums.CrnModeType;
-import com.zy.core.enums.JarModeType;
-import com.zy.core.enums.JarStatusType;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * Created by vincent on 2024/6/21
- */
-@Slf4j
-@Data
-public class JarProtocol {
-
- /**
- * 璁惧鍙�
- */
- private Integer jarNo;
-
- /**
- * 1 = 鑱旀満妯″紡
- * 0 = 鑴辨満妯″紡
- */
- public Integer mode;
-
- public JarModeType modeType;
-
-
- /**
- IDLE(0, "绌洪棽"),
- MOVING(1, "鍏ユ枡涓�"),
- SOS(2, "纭寲涓�"),
- WAITING1(3, "鍑烘枡涓�"),
- WAITING2(4, "鍋滄"),
- WAITING3(5, "杩涙枡闂ㄦ墦寮�涓�"),
- WAITING4(6, "鍑烘枡闂ㄦ墦寮�涓�"),
- WAITING5(7, "杩涙枡闂ㄥ叧闂腑"),
- OFF_LINE(8, "鍑烘枡闂ㄥ叧闂腑"),
- OTHER(100, "鍏跺畠"),
- */
- public Short status;
-
- public JarStatusType statusType;
-
- /*
- * 宸﹂棬鐘舵��
- * 杩涙枡闂�
- * */
- private boolean leftDoor;
-
- /*
- * 鍙抽棬鐘舵��
- * 鍑烘枡闂�
- * */
- private boolean rightDoor;
-
- /*
- * 宸﹂棬鍙紑
- * 杩涙枡闂�
- * */
- private boolean leftInEnable;
-
- /*
- * 宸﹂棬鍙叧
- * 杩涙枡闂�
- * */
- private boolean leftOutEnable;
-
- /*
- * 鍙抽棬鍙紑
- * 鍑烘枡闂�
- * */
- private boolean rightInEnable;
-
- /*
- * 鍙抽棬鍙叧
- * 鍑烘枡闂�
- * */
- private boolean rightOutEnable;
-
- /*
- * 鑷姩
- * */
- private boolean autoing;
-
- /*
- * open the left door
- * 杩涙枡闂�
- * */
- public Integer leftDoorOpen;
-
- /*
- * close the left door
- * 杩涙枡闂�
- * */
- public Integer leftDoorClose;
-
- /*
- * open the right door
- * 鍑烘枡闂�
- * */
- public Integer rightDoorOpen;
-
- /*
- * close the right door
- * 鍑烘枡闂�
- * */
- public Integer rightDoorClose;
-
- public Float jarTemperature;
-
-
- /**
- * 寮傚父鐮�
- */
- public Integer jarErr = 0;
-
- public void setStatus(Short status){
- this.status = status;
- this.statusType = JarStatusType.get(status);
- }
-
- public void setStatus(JarStatusType type){
- this.statusType = type;
- this.status = JarStatusType.get(type).id.shortValue();
- }
-
- public void setMode(Integer mode) {
- this.mode = mode;
- this.modeType = JarModeType.get(mode);
- }
-
- public void setMode(JarModeType type) {
- this.modeType = type;
- this.mode = JarModeType.get(type).id;
- }
-
- public BasJar toSqlModel(BasJar basJar){
- if (jarErr!=null) {
- basJar.setJarErr(jarErr);
- }
- basJar.setJarMode(mode);
- basJar.setJarStatus(status.intValue());
- basJar.setLeftDoor(leftDoor?"Y":"N");
- basJar.setRightDoor(rightDoor?"Y":"N");
- basJar.setLeftInEnable(leftInEnable?"Y":"N");
- basJar.setLeftOutEnable(leftOutEnable?"Y":"N");
- basJar.setRightInEnable(rightInEnable?"Y":"N");
- basJar.setRightOutEnable(rightOutEnable?"Y":"N");
- basJar.setAutoing(autoing?"Y":"N");
-
- return basJar;
- }
-
-}
diff --git a/src/main/java/com/zy/core/properties/SlaveProperties.java b/src/main/java/com/zy/core/properties/SlaveProperties.java
index b1d3ee9..fb800fa 100644
--- a/src/main/java/com/zy/core/properties/SlaveProperties.java
+++ b/src/main/java/com/zy/core/properties/SlaveProperties.java
@@ -22,8 +22,6 @@
@ConfigurationProperties(prefix = "wcs-slave")
public class SlaveProperties{
- private List<CrnSlave> crn = new ArrayList<>();
-
private List<RgvSlave> rgv = new ArrayList<>();
private List<DevpSlave> devp = new ArrayList<>();
@@ -35,8 +33,6 @@
private List<Slave> scale = new ArrayList<>();
private List<Slave> car = new ArrayList<>();
-
- private List<JarSlave> jar = new ArrayList<>();
private List<SteSlave> Ste = new ArrayList<>();
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
deleted file mode 100644
index 4fb3cbf..0000000
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?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.LocDetlMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.LocDetl">
- <result column="loc_no" property="locNo" />
- <result column="zpallet" property="zpallet" />
- <result column="anfme" property="anfme" />
- <result column="matnr" property="matnr" />
- <result column="maktx" property="maktx" />
- <result column="batch" property="batch" />
- <result column="order_no" property="orderNo" />
-
- <result column="specs" property="specs" />
- <result column="model" property="model" />
- <result column="color" property="color" />
- <result column="brand" property="brand" />
- <result column="unit" property="unit" />
- <result column="price" property="price" />
- <result column="sku" property="sku" />
- <result column="units" property="units" />
- <result column="barcode" property="barcode" />
- <result column="origin" property="origin" />
- <result column="manu" property="manu" />
- <result column="manu_date" property="manuDate" />
- <result column="item_num" property="itemNum" />
- <result column="safe_qty" property="safeQty" />
- <result column="weight" property="weight" />
- <result column="length" property="length" />
- <result column="volume" property="volume" />
- <result column="three_code" property="threeCode" />
- <result column="supp" property="supp" />
- <result column="supp_code" property="suppCode" />
- <result column="be_batch" property="beBatch" />
- <result column="dead_time" property="deadTime" />
- <result column="dead_warn" property="deadWarn" />
- <result column="source" property="source" />
- <result column="inspect" property="inspect" />
- <result column="danger" property="danger" />
-
- <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="memo" property="memo" />
- </resultMap>
-
- <sql id="stockOutCondition">
- <if test="loc_no!=null and loc_no!='' ">
- and a.loc_no like '%' + #{loc_no} + '%'
- </if>
- <if test="matNo!=null and matNo!='' ">
- and a.matnr like '%' + #{matNo} + '%'
- </if>
- <if test="matName!=null and matName!='' ">
- and a.maktx like '%' + #{matName} + '%'
- </if>
- <if test="anfme!=null and anfme!='' ">
- and a.anfme like '%' + #{anfme} + '%'
- </if>
- <if test="altme!=null and altme!='' ">
- and a.altme like '%' + #{altme} + '%'
- </if>
- <if test="startTime!=null and endTime!=null">
- and a.modi_time between #{startTime} and #{endTime}
- </if>
- </sql>
-
- <select id="getStockOutPage" resultMap="BaseResultMap">
- select * from
- (
- select
- ROW_NUMBER() over (order by a.appe_time,a.matnr,a.loc_no) as row,
- a.*
- from asr_loc_detl a
- left join asr_loc_mast b on a.loc_no = b.loc_no
- where 1=1
- and b.loc_sts = 'F'
- <include refid="stockOutCondition"></include>
- ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
- </select>
-
- <select id="getStockOutPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
- select
- count(1)
- from asr_loc_detl a
- left join asr_loc_mast b on a.loc_no = b.loc_no
- where 1=1
- and b.loc_sts = 'F'
- <include refid="stockOutCondition"></include>
- </select>
-</mapper>
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
deleted file mode 100644
index 7821af2..0000000
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?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="ctn_no" property="ctnNo" />
-
- </resultMap>
-
- <select id="queryFreeLocMast" resultMap="BaseResultMap">
- select top 1 *
- from asr_loc_mast
- where row1=#{row}
- and loc_sts='O'
- <if test="locType1 != null">
- and loc_type1 = #{locType1}
- </if>
- order by NEWID(),lev1 asc,bay1 asc
- </select>
-
- <select id="queryDemoSourceLoc" resultMap="BaseResultMap">
- select top 1 * from asr_loc_mast where crn_no = #{crnNo}
- and loc_sts='D'
- ORDER BY NEWID()
- </select>
-
- <select id="queryDemoLoc" resultMap="BaseResultMap">
- select top 1 * from asr_loc_mast where crn_no = #{crnNo} and loc_sts = 'O'
- ORDER BY NEWID()
- </select>
-
-</mapper>
diff --git a/src/main/resources/mapper/MatCodeMapper.xml b/src/main/resources/mapper/MatCodeMapper.xml
deleted file mode 100644
index 8e78b20..0000000
--- a/src/main/resources/mapper/MatCodeMapper.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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.MatCodeMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.MatCode">
- <result column="mat_no" property="matNo" />
- <result column="barcode" property="barcode" />
- <result column="mat_name" property="matName" />
- <result column="str1" property="str1" />
- <result column="str2" property="str2" />
- <result column="str3" property="str3" />
- <result column="str4" property="str4" />
- <result column="str5" property="str5" />
- <result column="str6" property="str6" />
- <result column="str7" property="str7" />
- <result column="str8" property="str8" />
- <result column="str9" property="str9" />
- <result column="str10" property="str10" />
- <result column="str11" property="str11" />
- <result column="str12" property="str12" />
- <result column="str13" property="str13" />
- <result column="str14" property="str14" />
- <result column="str15" property="str15" />
- <result column="str16" property="str16" />
- <result column="str17" property="str17" />
- <result column="str18" property="str18" />
- <result column="str19" property="str19" />
- <result column="str20" property="str20" />
- <result column="str21" property="str21" />
- <result column="str22" property="str22" />
- <result column="str23" property="str23" />
- <result column="num1" property="num1" />
- <result column="num2" property="num2" />
- <result column="num3" property="num3" />
- <result column="num4" property="num4" />
- <result column="num5" property="num5" />
- <result column="num6" property="num6" />
- <result column="date1" property="date1" />
- <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="status" property="status" />
-
- </resultMap>
-
-</mapper>
diff --git a/src/main/resources/mapper/RgvOneSignMapper.xml b/src/main/resources/mapper/RgvOneSignMapper.xml
deleted file mode 100644
index 6fae396..0000000
--- a/src/main/resources/mapper/RgvOneSignMapper.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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.RgvOneSignMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.RgvOneSign">
- <id column="id" property="id" />
- <result column="rgv_one_sign" property="rgvOneSign" />
- <result column="rgv_one_type" property="rgvOneType" />
-
- </resultMap>
-
- <select id="selectOneSign" resultMap="BaseResultMap">
- SELECT top 1 * FROM dbo.bas_rgv_one_sign where rgv_one_type=#{sign}
- </select>
-</mapper>
diff --git a/src/main/resources/mapper/WaitPakinMapper.xml b/src/main/resources/mapper/WaitPakinMapper.xml
deleted file mode 100644
index 4615185..0000000
--- a/src/main/resources/mapper/WaitPakinMapper.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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.WaitPakinMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WaitPakin">
- <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="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/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
deleted file mode 100644
index 60c9a60..0000000
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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.WrkDetlMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkDetl">
- <result column="wrk_no" property="wrkNo" />
- <result column="io_time" property="ioTime" />
- <result column="matnr" property="matnr" />
- <result column="maktx" property="maktx" />
- <result column="specs" property="specs" />
- <result column="size" property="size" />
- <result column="color" property="color" />
- <result column="weight" property="weight" />
- <result column="bill_no" property="billNo" />
- <result column="seq_no" property="seqNo" />
- <result column="brand" property="brand" />
- <result column="anfme" property="anfme" />
- <result column="unit" property="unit" />
- <result column="zpallet" property="zpallet" />
- <result column="bname" property="bname" />
- <result column="memo" property="memo" />
- <result column="modi_user" property="modiUser" />
- <result column="modi_time" property="modiTime" />
- <result column="appe_user" property="appeUser" />
- <result column="appe_time" property="appeTime" />
- </resultMap>
-
- <select id="findByWorkNo" resultMap="BaseResultMap">
- select wrk_no, matnr, maktx, anfme from asr_wrk_detl where 1=1 and wrk_no = #{workNo}
- </select>
-
- <update id="updateIoTime">
- update asr_wrk_detl
- set io_time = #{ioTime}
- where 1=1
- and wrk_no = #{workNo}
- </update>
-
- <select id="selectByWrkNo" resultMap="BaseResultMap">
- select * from asr_wrk_detl where 1=1 and wrk_no = #{wrkNo}
- </select>
-
-</mapper>
diff --git a/src/main/resources/mapper/WrkMastCrnMapper.xml b/src/main/resources/mapper/WrkMastCrnMapper.xml
deleted file mode 100644
index 47b38ef..0000000
--- a/src/main/resources/mapper/WrkMastCrnMapper.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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.WrkMastCrnMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMastCrn">
- <result column="wrk_no" property="wrkNo" />
- <result column="wrk_sts" property="wrkSts" />
- <result column="io_type" property="ioType" />
- <result column="crn_no" property="crnNo" />
- <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="io_time" property="ioTime" />
- <result column="modi_user" property="modiUser" />
- <result column="modi_time" property="modiTime" />
- <result column="wrk_no_one" property="wrkNoOne" />
- <result column="wrk_no_two" property="wrkNoTwo" />
- <result column="loc_no_one" property="locNoOne" />
- <result column="loc_no_two" property="locNoTwo" />
- <result column="sta_no_one" property="staNoOne" />
- <result column="sta_no_two" property="staNoTwo" />
- <result column="source_sta_no_one" property="sourceStaNoOne" />
- <result column="source_sta_no_two" property="sourceStaNoTwo" />
- <result column="source_loc_no_one" property="sourceLocNoOne" />
- <result column="source_loc_no_two" property="sourceLocNoTwo" />
-
- </resultMap>
-
- <select id="selectWrkNoOneAndTwo" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast_crn where wrk_no=#{wrkNo}
- </select>
-
-</mapper>
diff --git a/src/main/resources/mapper/WrkMastExecuteMapper.xml b/src/main/resources/mapper/WrkMastExecuteMapper.xml
deleted file mode 100644
index e3853a4..0000000
--- a/src/main/resources/mapper/WrkMastExecuteMapper.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?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.WrkMastExecuteMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMastExecute">
- <id column="id" property="id" />
- <result column="wrk_no" property="wrkNo" />
- <result column="enter_sta_no" property="enterStaNo" />
- <result column="out_sta_no" property="outStaNo" />
- <result column="jar_enter_sta_no" property="jarEnterStaNo" />
- <result column="jar_out_sta_no" property="jarOutStaNo" />
- <result column="jar_id" property="jarId" />
- <result column="jar_regin" property="jarRegin" />
- <result column="status" property="status" />
- <result column="ste_id" property="steId" />
- <result column="rgv_id" property="rgvId" />
- <result column="io_time" property="ioTime" />
- <result column="modi_time" property="modiTime" />
- <result column="appe_time" property="appeTime" />
- <result column="wrk_type" property="wrkType" />
- <result column="wrk_sts" property="wrkSts" />
- <result column="io_type" property="ioType" />
- <result column="type" property="type" />
- <result column="rgv_end_id" property="rgvEndId" />
-
- </resultMap>
-
- <sql id="batchSeq">
- <if test="type != null">
- and type = #{type}
- </if>
- <if test="ioType != null">
- and io_type = #{ioType}
- </if>
- <if test="wrkSts != null">
- and wrk_sts = #{wrkSts}
- </if>
- <if test="steNo != null">
- and ste_id = #{steNo}
- </if>
- <if test="jarNo != null">
- and jar_id = #{jarNo}
- </if>
- <if test="rgvNo != null">
- and rgv_id = #{rgvNo}
- </if>
- <!-- <choose>-->
- <!-- <when test="type != null and type != ''">-->
- <!-- and type = #{type}-->
- <!-- </when>-->
- <!-- <otherwise>-->
- <!-- and (type IS NULL OR type = '')-->
- <!-- </otherwise>-->
- <!-- </choose>-->
-
- </sql>
-
- <select id="getWrkMastExecuteByCharge" resultMap="BaseResultMap">
- select top 1 * from jar_wrk_mast_execute
- where 1=1
- and ste_id = #{steNo}
- and io_type = 100
- and wrk_type != 2
- </select>
-
- <select id="getWrkMastExecuteByWrkNo" resultMap="BaseResultMap">
- select top 1 * from jar_wrk_mast_execute
- where 1=1
- and wrk_no = #{wrkNo}
- </select>
-
- <select id="getWrkMastExecuteByWrkNoList" resultMap="BaseResultMap">
- select * from jar_wrk_mast_execute
- where 1=1
- and wrk_no = #{wrkNo}
- </select>
-
- <select id="getWrkMastExecuteByJarNo" resultMap="BaseResultMap">
- select * from jar_wrk_mast_execute
- where 1=1
- and jar_id = #{jarId}
- </select>
-
- <select id="selectWrkMastExecuteByType" resultMap="BaseResultMap">
- select * from jar_wrk_mast_execute
- where 1=1
- and type = #{type}
- and wrk_type = 0;
- </select>
-
- <select id="selectWrkMastExecuteByTypeAndIoTyperAndWrkType" resultMap="BaseResultMap">
- select * from jar_wrk_mast_execute
- where 1=1
- <if test="type != null">
- and type = #{type}
- </if>
- <if test="ioType != null">
- and io_type = #{ioType}
- </if>
- <if test="wrkSts != null">
- and wrk_sts = #{wrkSts}
- </if>
- <if test="jarRegin != null">
- and jar_regin = #{jarRegin}
- </if>
- </select>
-
- <select id="selectWrkMastExecuteByWrk" resultMap="BaseResultMap">
- select * from jar_wrk_mast_execute
- where 1=1
- <include refid="batchSeq"></include>
- </select>
-
- <select id="getWrkMastExecuteByJarIdCount" resultType="Integer">
- select count(1) from jar_wrk_mast_execute
- where 1=1
- and jar_id = #{jarId}
- </select>
-
- <select id="getWrkMastExecuteByjarReginCount" resultType="Integer">
- select count(1) from jar_wrk_mast_execute
- where 1=1
- and jar_regin = #{jarRegin}
- </select>
-
- <select id="selectNoStart" resultType="Integer">
- select count(1) from jar_wrk_mast_execute
- where 1=1
- and jar_regin = #{jarRegin}
- and wrk_type != 0
- </select>
- <select id="selectNoStartCharge" resultType="Integer">
- select count(1) from jar_wrk_mast_execute
- where 1=1
- and jar_regin = #{jarRegin}
- and wrk_type != 0
- and io_type != 100
- </select>
-
- <select id="selectMoveStart" resultType="Integer">
- select count(1) from jar_wrk_mast_execute
- where 1=1
- and jar_regin = #{jarRegin}
- and io_type in (7,8,10,11)
- </select>
-
- <select id="selectMoveStartCharge" resultType="Integer">
- select count(1) from jar_wrk_mast_execute
- where 1=1
- and jar_regin = #{jarRegin}
- and io_type in (8,11)
- </select>
-
- <select id="selectStart" resultMap="BaseResultMap">
- select top 1 * from jar_wrk_mast_execute
- where 1=1
- and jar_regin = #{jarRegin}
- and wrk_type = 0
- </select>
-
-</mapper>
diff --git a/src/main/resources/mapper/WrkMastSplitTwinMapper.xml b/src/main/resources/mapper/WrkMastSplitTwinMapper.xml
deleted file mode 100644
index 373cc5b..0000000
--- a/src/main/resources/mapper/WrkMastSplitTwinMapper.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?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.WrkMastSplitTwinMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMastSplitTwin">
- <id column="id" property="id" />
- <result column="wrk_no" property="wrkNo" />
- <result column="create_time" property="createTime" />
- <result column="update_time" property="updateTime" />
- <result column="type" property="type" />
- <result column="wrk_sts" property="wrkSts" />
- <result column="line_number" property="lineNumber" />
- <result column="wrk_type" property="wrkType" />
- <result column="bign_time" property="bignTime" />
- <result column="crn_no" property="crnNo" />
- <result column="wrk_start" property="wrkStart" />
- <result column="wrk_end" property="wrkEnd" />
- <result column="start_row" property="startRow" />
- <result column="start_bay" property="startBay" />
- <result column="start_lev" property="startLev" />
- <result column="end_row" property="endRow" />
- <result column="end_bay" property="endBay" />
- <result column="end_lev" property="endLev" />
- <result column="io_type" property="ioType" />
-
- </resultMap>
-
- <sql id="batchSeq">
- <if test="type != null">
- and type = #{type}
- </if>
- <if test="ioType != null">
- and io_type = #{ioType}
- </if>
- <if test="wrkType != null">
- and wrk_type = #{wrkType}
- </if>
- <if test="wrkSts != null">
- and wrk_sts = #{wrkSts}
- </if>
- <if test="crnNo != null">
- and crn_no = #{crnNo}
- </if>
-<!-- <choose>-->
-<!-- <when test="type != null and type != ''">-->
-<!-- and type = #{type}-->
-<!-- </when>-->
-<!-- <otherwise>-->
-<!-- and (type IS NULL OR type = '')-->
-<!-- </otherwise>-->
-<!-- </choose>-->
-
- </sql>
-
- <select id="getWrkMastSplitTwin" resultMap="BaseResultMap">
- select * from asr_wrk_mast_split_twin
- where 1=1
- <include refid="batchSeq"></include>
- order by line_number,id
- </select>
-
-</mapper>
diff --git a/src/main/resources/mapper/WrkMastStaMapper.xml b/src/main/resources/mapper/WrkMastStaMapper.xml
deleted file mode 100644
index 6650f59..0000000
--- a/src/main/resources/mapper/WrkMastStaMapper.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?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.WrkMastStaMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMastSta">
- <id column="id" property="id" />
- <result column="wrk_no" property="wrkNo" />
- <result column="wrk_start" property="wrkStart" />
- <result column="wrk_end" property="wrkEnd" />
- <result column="sta_start" property="staStart" />
- <result column="sta_end" property="staEnd" />
- <result column="create_time" property="createTime" />
- <result column="update_time" property="updateTime" />
- <result column="type" property="type" />
- <result column="wrk_sts" property="wrkSts" />
- <result column="line_number" property="lineNumber" />
- <result column="wrk_type" property="wrkType" />
- <result column="bign_time" property="bignTime" />
-
- </resultMap>
-
- <select id="selectAllWrkMastStaList" resultMap="BaseResultMap">
- select * from asr_wrk_mast_sta
- where 1=1
- and wrk_sts=0
- <if test="type!=null">
- and type = #{type}
- </if>
- order by line_number,id
- </select>
-
- <select id="selectByWrkNo" resultMap="BaseResultMap">
- select top 1 * from asr_wrk_mast_sta
- where 1=1
- and wrk_no = #{workNo}
- </select>
-
- <select id="selectNoInterfere" resultMap="BaseResultMap">
- select top 1 * from asr_wrk_mast_sta
- where 1=1
- and (sta_start in
- <foreach item="item" collection="staStarts" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- or sta_start = 0
- )
- and (sta_end in
- <foreach item="item" collection="staEnds" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- or sta_end = 0
- )
- and wrk_sts=0
- order by line_number,id
- </select>
-
- <select id="selectNoInterfereList" resultMap="BaseResultMap">
- select * from asr_wrk_mast_sta
- where 1=1
- and (sta_start in
- <foreach item="item" collection="staStarts" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- or sta_start = 0
- )
- and (sta_end in
- <foreach item="item" collection="staEnds" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- or sta_end = 0
- )
- and wrk_sts=0
- order by line_number,id
- </select>
-
- <select id="selectAllWrkCount" resultType="Integer">
- select count(1) from asr_wrk_mast_sta
- where 1=1
- <if test="type!=null">
- and type = #{type}
- </if>
- </select>
-
- <select id="selectAllWrkStsCount" resultType="Integer">
- select count(1) from asr_wrk_mast_sta
- where 1=1
- <if test="type!=null">
- and type = #{type}
- </if>
- <if test="wrkSts!=null">
- and wrk_sts = #{wrkSts}
- </if>
- </select>
-
-
-
-
-</mapper>
diff --git a/src/main/webapp/static/css/crn.css b/src/main/webapp/static/css/crn.css
deleted file mode 100644
index 2dc5b06..0000000
--- a/src/main/webapp/static/css/crn.css
+++ /dev/null
@@ -1,252 +0,0 @@
-body {
- background-color: #6CA7A8;
-}
-.button-window {
- float: left;
- width: 100%;
- height: 100%;
- padding: 10px;
- border-radius: 5px;
- box-shadow: 0 0 3px rgba(0 0 0 .3);
-}
-/* -------------------- 绗竴妯″潡 -------------------- */
-.log-board {
- background-color: #fff;
- border-radius: 5px;
- box-shadow: 0 0 3px rgba(0,0,0,.3);
- height: 28%;
-}
-
-/* 宸� */
-.command-log {
- float: left;
- height: 100%;
- width: 20%;
- text-align: center;
-}
-.command-log h2 {
- padding: 10px;
-}
-.crn-command-item {
- padding: 4px 0;
-}
-.crn-command-item label {
- font-size: 20px;
- font-weight: bold;
- vertical-align: middle;
-}
-.crn-command-item span {
- display: inline-block;
- width: 20px;
- height: 20px;
- background-color: #2e9926;
- border-radius: 5px;
- vertical-align: middle;
-}
-.crn-command-item input {
- vertical-align: middle;
- outline: none;
- width: 60%;
-}
-
-/* 鍙� */
-.crn-state {
- float: left;
- height: 100%;
- width: 80%;
- overflow: auto;
-}
-/* 鍫嗗灈鏈虹姸鎬佽〃 */
-#crn-state-table {
- font-size: 12px;
- border-collapse: collapse;
- margin: 0 auto;
- text-align: center;
-}
-#crn-state-table td, #crn-state-table th {
- border: 1px solid #cad9ea;
- color: #666;
- height: 25px;
-}
-#crn-state-table thead th {
- background-color: #CCE8EB;
- width: 300px;
-}
-#crn-state-table tr:nth-child(odd) {
- background: #fff;
-}
-#crn-state-table tr:nth-child(even) {
- background: #F5FAFA;
-}
-
-/* -------------------- 绗簩妯″潡 -------------------- */
-.crn-msg {
- /*overflow: auto;*/
- margin-top: 10px;
- height: 23%;
- background-color: #fff;
- border-radius: 5px;
- box-shadow: 0 0 3px rgba(0,0,0,.3);
-}
-/* 鍫嗗灈鏈虹姸鎬佷俊鎭〃 */
-#crn-msg-table {
- font-size: 12px;
- border-collapse: collapse;
- margin: 0 auto;
- text-align: center;
-}
-#crn-msg-table td, #crn-msg-table th {
- border: 1px solid #f1f1f1;
- color: #666;
- height: 30px;
-}
-#crn-msg-table thead th {
- background-color: #fff;
- width: 400px;
-}
-#crn-msg-table tr:nth-child(odd) {
- background: #fff;
-}
-#crn-msg-table tr:nth-child(even) {
- background: #fff;
-}
-
-/* -------------------- 绗笁妯″潡 -------------------- */
-.crn-operation {
- position: relative;
- margin-top: 10px;
- height: 25%;
- background-color: #fff;
- border-radius: 5px;
- box-shadow: 0 0 3px rgba(0,0,0,.3);
-}
-
-/* 浠诲姟璁惧閫夋嫨妗� */
-.task-select {
- height: 50%;
- overflow: hidden;
- padding: 20px 0 10px 20px;
-}
-.operator-item {
- display: inline-block;
- height: 100%;
- width: 20%;
- text-align: center;
- position: relative;
- vertical-align: middle;
- padding: 10px 0px 10px 50px;
-}
-.operator-item .select-title {
- display: inline-block;
- position: absolute;
- top: -11px;
- left: 50%;
- transform: translate(-50%, 0);
- background-color: #fff;
- color: #2e95d3;
- font-size: 12px;
- border: 1px solid #8d8d8d;
- border-radius: 5px;
- padding: 5px;
- z-index: 999;
-}
-.operator-item .select-container {
- padding: 10px 0;
- height: 100%;
- border: 1px solid #8d8d8d;
- border-radius: 5px;
-}
-#crn-select .select-container label {
- display: inline-block;
- padding: 0 20px;
- vertical-align: middle; margin-top:-2px; margin-bottom:1px;
-
-}
-.select-container input {
- display: inline-block;
- font-size: 12px;
- vertical-align: middle; margin-top:-2px; margin-bottom:1px;
-}
-.select-container-item {
- display: inline-block;
- margin: 0px auto;
- padding: 0;
-}
-.select-container-item input {
- height: 20px;
- border: 1px solid #8D8D8D;
- border-radius: 3px;
- width: 80px;
- outline: none;
-}
-
-/* 浠诲姟浣滀笟閫夋嫨妗� */
-.task-operator {
- height: 50%;
- overflow: hidden;
- padding: 0 20px 10px 20px;
-}
-.task-operator fieldset {
- padding: 15px 20px 5px 50px;
- border-width: 1px;
- border-style: solid;
- height: 100%;
-}
-.task-operator legend {
- margin-left: 20px;
- padding: 0 10px;
- font-size: 16px;
- font-weight: 300;
-}
-button.item {
- border: 1px solid #333;
- font-size: 13px;
- padding: 1px 1px 1px 1px;
- width: 100px;
- height: 40px;
- outline: none;
- cursor: pointer;
- color: #333;
- background-color: transparent;
- margin-right: 5px;
- border-radius: 5px;
-}
-button.item:hover {
- background-color: #333;
- color: #fff;
-}
-
-/* 鎵嬪姩鎿嶄綔閬僵 */
-.crn-operation-shade {
- position: absolute;
- height: 100%;
- width: 100%;
- z-index: 1000;
- text-align: center;
- padding: 80px 0;
-}
-.crn-operation-shade-span {
- font-size: xx-large;
- font-weight: bold;
- color: red;
-}
-
-/* -------------------- 绗洓妯″潡 -------------------- */
-.crn-output-board {
- margin-top: 10px;
- height: 15%;
- background-color: #fff;
- border-radius: 5px;
- box-shadow: 0 0 3px rgba(0,0,0,.3);
-}
-#crn-output {
- border-left: none;
- border-right: none;
- border-top: 1px solid #9d9d9d;
- border-bottom: 1px solid #333;
- width: 100%;
- height: 100%;
- overflow: auto;
- resize:none;
- color: #666;
-}
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
deleted file mode 100644
index e9c53c9..0000000
--- a/src/main/webapp/views/crn.html
+++ /dev/null
@@ -1,651 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <title>鍫嗗灈鏈虹洃鎺х鐞�</title>
- <meta name="renderer" content="webkit">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
- <link rel="stylesheet" type="text/css" href="../static/css/normalize.css">
- <link rel="stylesheet" type="text/css" href="../static/css/common.css">
- <link rel="stylesheet" type="text/css" href="../static/css/crn.css">
- <script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
- <script type="text/javascript" src="../static/js/common.js"></script>
- <script type="text/javascript" src="../static/js/layer/layer.js"></script>
- <style>
- .demoBtn {
- vertical-align: middle;
- width: 20%;
- height: 25px;
- left: 0;
- top: 0;
- text-shadow: inherit;
- font-size: 15px;
- margin-left: 5px;
- margin-right: 5px;
- display: inline-block;
- background-color: #FF5722;
- border: none;
- color: #FFF;
- box-shadow: 1px 1px 5px #B6B6B6;
- border-radius: 3px;
- cursor: pointer;
- }
-
- .demoBtn:hover {
- opacity: 0.8
- }
- .demoBtn:focus {
- outline: 0;
- }
- </style>
-</head>
-<body>
-<div style="padding: 10px;height: 100%;float: left;width: 6%">
- <div class="button-window"></div>
-</div>
-<div style="height: 100%;padding-left: 6%">
- <div style="padding: 10px;height: 100%">
- <!-- 鏃ュ織鐩戞帶鏉� -->
- <div class="log-board">
- <!-- 鎵ц鍛戒护 -->
-
- <!-- 鎵ц鍛戒护 -->
- <div class="command-log">
- <h3>鎵ц涓殑鍛戒护</h3>
- <div class="crn-command-item">
- <label>1#</label>
- <button id="demoBtn-1" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
- <!-- <span> </span>-->
- <input id="crn1" disabled="disabled">
- </div>
- <div class="crn-command-item">
- <label>2#</label>
- <button id="demoBtn-2" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
- <!-- <span> </span>-->
- <input id="crn2" disabled="disabled">
- </div>
- <div class="crn-command-item">
- <label>3#</label>
- <button id="demoBtn-3" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
- <!-- <span> </span>-->
- <input id="crn3" disabled="disabled">
- </div>
- <div class="crn-command-item">
- <label>4#</label>
- <button id="demoBtn-4" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
- <!-- <span> </span>-->
- <input id="crn4" disabled="disabled">
- </div>
- <div class="crn-command-item">
- <label>5#</label>
- <button id="demoBtn-5" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
- <!-- <span> </span>-->
- <input id="crn5" disabled="disabled">
- </div>
- <div class="crn-command-item">
- <label>6#</label>
- <button id="demoBtn-6" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
- <!-- <span> </span>-->
- <input id="crn6" disabled="disabled">
- </div>
- </div>
- <!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
- <div class="crn-state">
- <table id="crn-state-table">
- <thead>
- <tr>
- <th>鍫嗗灈鏈�</th>
- <th>妯″紡</th>
- <th>鐘舵��</th>
- <th>鏈夌墿</th>
- <th>鍒�</th>
- <th>灞�</th>
- <th>璐у弶瀹氫綅</th>
- <th>杞借揣鍙板畾浣�</th>
- <th>璧拌鍦ㄥ畾浣�</th>
- <th>鏁呴殰浠ｇ爜</th>
- <th>鏁呴殰鎻忚堪</th>
- </tr>
- </thead>
- <tbody>
- </tbody>
- </table>
- </div>
- </div>
- <!-- 鍫嗗灈鏈虹姸鎬� -->
- <div class="crn-msg">
- <table id="crn-msg-table">
- <thead>
- <tr>
- <th>鍫嗗灈鏈�</th>
- <th>宸ヤ綔鍙�</th>
- <th>鐘舵��</th>
- <th>婧愮珯</th>
- <th>鐩爣绔�</th>
- <th>婧愬簱浣�</th>
- <th>鐩爣搴撲綅</th>
-<!-- <th>璧拌閫熷害锛坢/min)</th>-->
-<!-- <th>鍗囬檷閫熷害锛坢/min)</th>-->
-<!-- <th>鍙夌墮閫熷害锛坢/min)</th>-->
-<!-- <th>璧拌璺濈(Km)</th>-->
-<!-- <th>鍗囬檷璺濈(Km)</th>-->
-<!-- <th>璧拌鏃堕暱(H)</th>-->
-<!-- <th>鍗囬檷鏃堕暱(H)</th>-->
- </tr>
- </thead>
- <tbody>
- </tbody>
- </table>
- </div>
- <!-- 鎵嬪姩鎿嶄綔 -->
- <div class="crn-operation">
-
- <!-- 閬僵灞� -->
- <div class="crn-operation-shade">
- <span class="crn-operation-shade-span">
- WCS 绯荤粺杩愯涓紝璇峰仠姝㈠悗鎿嶄綔
- </span>
- </div>
-
- <!-- 璁惧浠诲姟閫夋嫨 -->
- <div class="task-select">
- <!-- 鍫嗗灈鏈洪�夋嫨 -->
- <div id="crn-select" class="operator-item" style="width: 55%">
- <span class="select-title">鍫嗗灈鏈哄彿</span>
- <div class="select-container" style="padding: 20px 0;">
- <label><input type="radio" name="crnSelect" value="1" checked> 1鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="2"> 2鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="3"> 3鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="4"> 4鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="5"> 5鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="6"> 6鍙峰爢鍨涙満</label>
- </div>
- </div>
- <!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
- <div id="source-select" class="operator-item">
- <span class="select-title">婧愮珯/婧愬簱浣�</span>
- <div class="select-container">
- <div class="select-container-item">
- <span>绔�</span>
- <label><input id="sourceStaNo" type="number" name="points" min="0" /></label>
- </div>
- <div class="select-container-item">
- <span>鎺�</span>
- <label><input id="sourceRow" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
- </div>
- <div class="select-container-item">
- <span>鍒�</span>
- <label><input id="sourceBay" type="number" name="points" min="0" style="background-color: #a9eeff" value="0" /></label>
- </div>
- <div class="select-container-item">
- <span>灞�</span>
- <label><input id="sourceLev" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
- </div>
- </div>
- </div>
- <!-- 鐩爣绔�/鐩爣搴撲綅 閫夋嫨 -->
- <div id="target-select" class="operator-item">
- <span class="select-title">鐩爣绔�/鐩爣搴撲綅</span>
- <div class="select-container">
- <div class="select-container-item">
- <span>绔�</span>
- <label><input id="staNo" type="number" name="points" min="0" /></label>
- </div>
- <div class="select-container-item">
- <span>鎺�</span>
- <label><input id="row" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
- </div>
- <div class="select-container-item">
- <span>鍒�</span>
- <label><input id="bay" type="number" name="points" min="0" style="background-color: #a9eeff" value="0" /></label>
- </div>
- <div class="select-container-item">
- <span>灞�</span>
- <label><input id="lev" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
- </div>
- </div>
- </div>
- </div>
-
- <!-- 璁惧浠诲姟鎿嶄綔 -->
- <div class="task-operator">
- <fieldset>
- <legend>鎵嬪姩鎿嶄綔</legend>
- <div class="button-group">
- <button class="item" onclick="put()">鍏ュ簱</button>
- <button class="item" onclick="take()">鍑哄簱</button>
- <button class="item" onclick="stockMove()">搴撲綅杞Щ</button>
- <button class="item" onclick="siteMove()">绔欏埌绔�</button>
- <!-- <button class="item" onclick="bacOrigin()">鍥炲師鐐�</button>-->
- <!-- <button class="item" onclick="reverseOrigin()">鍙嶅師鐐�</button>-->
- <!-- <button class="item" onclick="coorMove()">鍧愭爣绉昏</button>-->
- <button class="item" onclick="taskComplete()">浠诲姟瀹屾垚</button>
- <!-- <button class="item" onclick="pause()">鏆傚仠</button>-->
- <!-- <button class="item" onclick="boot()">鍚姩</button>-->
- <button class="item" onclick="clearCommand()">娓呴櫎鍛戒护</button>
- <button class="item" onclick="handleReset()">澶嶄綅</button>
- </div>
- </fieldset>
- </div>
-
- </div>
- <!-- 鍫嗗灈鏈烘棩蹇楄緭鍑� -->
- <div class="crn-output-board">
- <textarea id="crn-output"></textarea>
- </div>
- </div>
-</div>
-</body>
-<script>
- // 绌虹櫧琛屾暟
- var crnStateTableBlankRows = 0;
- var crnMsgTableBlankRows = 0;
- // 瀹為檯琛屾暟
- var crnStateTableFullRows = 0;
- var crnMsgTableFullRows = 0;
- // 鍒濆鍖�
- var crnOutputDom = document.getElementById("crn-output");
- $(document).ready(function() {
- getCommandLog();
- initCrnStateTable();
- getCrnStateInfo();
- initCrnMsgTable();
- getCrnMsgInfo();
- operatorBlockShow();
- });
- // 鏁版嵁鏇存柊
- setInterval(function () {
- getCrnStateInfo();
- getCrnMsgInfo();
- getCommandLog();
- },1000);
- setInterval(function () {
- getCrnOutput();
- operatorBlockShow();
- initDemo();
- },500);
-
- // 鍒ゆ柇鎵嬪姩鎿嶄綔妯″潡鏄惁鍙敤
- function operatorBlockShow() {
- if (parent.systemRunning) {
- $('.crn-operation').css("opacity", "0.5");
- $('.crn-operation-shade').show();
- $('.crn-operation-shade-span').show();
- } else {
- $('.crn-operation').css("opacity", "1");
- $('.crn-operation-shade').hide();
- $('.crn-operation-shade-span').hide();
- }
- }
-
- // 鑾峰彇鍫嗗灈鏈烘墽琛屼腑鐨勫懡浠�
- function getCommandLog() {
- $.ajax({
- url: baseUrl + "/crn/command/ongoing",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- var commands = res.data;
- for (var i=0; i<commands.length;i++){
- $("#crn"+commands[i].crnNo).val(commands[i].command);
- }
- } else if (res.code === 403) {
- window.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- })
- }
-
- // 鍫嗗灈鏈轰俊鎭〃鑾峰彇 ---- 琛ㄤ竴
- function getCrnStateInfo() {
- var tableEl = $('#crn-state-table');
- $.ajax({
- url: baseUrl+ "/crn/table/crn/state",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200){
- var table = res.data;
- if (table.length > crnStateTableBlankRows && table.length !== crnStateTableFullRows) {
- initCrnStateTable(table.length-crnStateTableBlankRows);
- crnStateTableFullRows = table.length;
- }
- for (var i=1;i<=table.length;i++){
- var tr = tableEl.find("tr").eq(i);
- setVal(tr.children("td").eq(0), table[i-1].crnNo);
- setVal(tr.children("td").eq(1), table[i-1].statusType);
- setVal(tr.children("td").eq(2), table[i-1].status);
- setVal(tr.children("td").eq(3), table[i-1].loading);
- setVal(tr.children("td").eq(4), table[i-1].bay);
- setVal(tr.children("td").eq(5), table[i-1].lev);
- setVal(tr.children("td").eq(6), table[i-1].forkOffset);
- setVal(tr.children("td").eq(7), table[i-1].liftPos);
- setVal(tr.children("td").eq(8), table[i-1].walkPos);
- setVal(tr.children("td").eq(9), table[i-1].warnCode);
- setVal(tr.children("td").eq(10), table[i-1].alarm);
- }
- } else if (res.code === 403){
- window.location.href = baseUrl+"/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 鍫嗗灈鏈烘暟鎹〃鑾峰彇 ---- 琛ㄤ簩
- function getCrnMsgInfo() {
- var tableEl = $('#crn-msg-table');
- $.ajax({
- url: baseUrl+ "/crn/table/crn/msg",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200){
- var table = res.data;
- if (table.length > crnStateTableBlankRows && table.length !== crnMsgTableFullRows) {
- initCrnStateTable(table.length-crnStateTableBlankRows);
- crnMsgTableFullRows = table.length;
- }
- for (var i=1;i<=table.length;i++){
- var tr = tableEl.find("tr").eq(i);
- setVal(tr.children("td").eq(0), table[i-1].crnNo);
- setVal(tr.children("td").eq(1), table[i-1].workNo);
- setVal(tr.children("td").eq(2), table[i-1].status);
- setVal(tr.children("td").eq(3), table[i-1].sourceStaNo);
- setVal(tr.children("td").eq(4), table[i-1].staNo);
- setVal(tr.children("td").eq(5), table[i-1].sourceLocNo);
- setVal(tr.children("td").eq(6), table[i-1].locNo);
- // setVal(tr.children("td").eq(7), table[i-1].xspeed);
- // setVal(tr.children("td").eq(8), table[i-1].yspeed);
- // setVal(tr.children("td").eq(9), table[i-1].zspeed);
- // setVal(tr.children("td").eq(10), table[i-1].xdistance);
- // setVal(tr.children("td").eq(11), table[i-1].ydistance);
- // setVal(tr.children("td").eq(12), table[i-1].xduration);
- // setVal(tr.children("td").eq(13), table[i-1].yduration);
- }
- } else if (res.code === 403){
- window.location.href = baseUrl+"/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 鍫嗗灈鏈烘墜鍔ㄦ搷浣滃尯 -----------------------------------------------------------------------
-
- function getReqParam() {
- var crnNo = $('input[name="crnSelect"]:checked').val();
- var sourceStaNo = $('#sourceStaNo').val();
- var sourceRow = $('#sourceRow').val();
- var sourceBay = $('#sourceBay').val();
- var sourceLev = $('#sourceLev').val();
- var staNo = $('#staNo').val();
- var row = $('#row').val();
- var bay = $('#bay').val();
- var lev = $('#lev').val();
- return {
- crnNo: crnNo,
- sourceStaNo: sourceStaNo,
- sourceRow: sourceRow,
- sourceBay: sourceBay,
- sourceLev: sourceLev,
- staNo: staNo,
- row: row,
- bay: bay,
- lev: lev
- };
- }
-
- // 鍏ュ簱
- function put() {
- http.post(baseUrl+"/crn/operator/put", getReqParam(), function (res) {
- layer.msg(res.msg);
- });
- }
-
- // 鍑哄簱
- function take() {
- http.post(baseUrl+"/crn/operator/take", getReqParam(), function (res) {
- layer.msg(res.msg);
- });
- }
-
- // 搴撲綅杞Щ
- function stockMove() {
- http.post(baseUrl+"/crn/operator/stockMove", getReqParam(), function (res) {
- layer.msg(res.msg);
- });
- }
-
- // 绔欏埌绔�
- function siteMove() {
- http.post(baseUrl+"/crn/operator/siteMove", getReqParam(), function (res) {
- layer.msg(res.msg);
- });
- }
-
- // 鍧愭爣绉诲姩
- function coorMove() {
- http.post(baseUrl+"/crn/operator/coorMove", getReqParam(), function (res) {
- layer.msg(res.msg);
- });
- }
-
- // 鍥炲師鐐�
- function bacOrigin() {
- http.post(baseUrl+"/crn/operator/bacOrigin", getReqParam(), function (res) {
- layer.msg(res.msg);
- });
- }
-
- // 鍥炲師鐐�
- function reverseOrigin() {
- http.post(baseUrl+"/crn/operator/reverseOrigin", getReqParam(), function (res) {
- layer.msg(res.msg);
- });
- }
-
- // 浠诲姟瀹屾垚
- function taskComplete() {
- http.post(baseUrl+"/crn/operator/taskComplete", getReqParam(), function (res) {
- layer.msg(res.msg);
- });
- }
-
- // 鏆傚仠
- function pause() {
- http.post(baseUrl+"/crn/operator/pause", getReqParam(), function (res) {
- layer.msg(res.msg);
- });
- }
-
- // 鍚姩
- function boot() {
- http.post(baseUrl+"/crn/operator/boot", getReqParam(), function (res) {
- layer.msg(res.msg);
- });
- }
-
- // 娓呴櫎鍛戒护
- function clearCommand() {
- http.post(baseUrl+"/crn/operator/clearCommand", getReqParam(), function (res) {
- layer.msg(res.msg);
- });
- }
-
- // 鎵嬪姩澶嶄綅
- function handleReset() {
- http.post(baseUrl+"/crn/operator/handleReset", getReqParam(), function (res) {
- layer.msg(res.msg);
- });
- }
-
- // 杈撻�佽澶囨棩蹇楄緭鍑� -----------------------------------------------------------------------
- function getCrnOutput() {
- $.ajax({
- url: baseUrl + "/crn/output/site",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- console.log(res)
- if (res.code === 200) {
- crnOutput(res.data);
- } else if (res.code === 403) {
- window.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- })
- }
-
- // ------------------------------------------------------------------------------------------------
-
- // 鍫嗗灈鏈轰俊鎭〃鑾峰彇 ----- 琛ㄤ竴
- function initCrnStateTable(row) {
- var line;
- if (row === undefined){
- var one = $('#crn-state-table thead').height();
- var total = $('.crn-state').height();
- var count = total / one;
- count = parseInt(count) - 1;
- crnStateTableBlankRows = count;
- line = count;
- } else {
- line = row;
- }
- var html = "";
- for (var i = 0; i < line; i ++){
- html += " <tr>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
- " </tr>\n";
- }
- $('#crn-state-table tbody').after(html);
- }
-
- // 鍫嗗灈鏈烘暟鎹〃鑾峰彇 ----- 琛ㄤ簩
- function initCrnMsgTable(row) {
- var line;
- if (row === undefined){
- var one = $('#crn-msg-table thead').height();
- var total = $('.crn-msg').height();
- var count = total / one;
- count = parseInt(count) - 1;
- crnMsgTableBlankRows = count;
- line = count;
- } else {
- line = row;
- }
- var html = "";
- for (var i = 0; i < line; i ++){
- html += " <tr>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
- " </tr>\n";
- }
- $('#crn-msg-table tbody').after(html);
- }
-
- // 鏃ュ織杈撳嚭妗�
- function crnOutput(content){
- crnOutputDom.value += content;
- crnOutputDom.scrollTop = crnOutputDom.scrollHeight;
- }
-
-
- var crnDemoData;
- function initDemo() {
- $.ajax({
- url: baseUrl+"/crn/demo/status",
- async: false,
- method: 'GET',
- success: function (res) {
- if (res.code === 200) {
- crnDemoData = res.data;
- crnDemoData.forEach(function (e) {
- $("#demoBtn-"+e.crnNo).html(e.demo?'鍋滄':'婕旂ず');
- })
- } else if (res.code === 403){
- parent.location.href = baseUrl+"/login";
- } else {
- layer.msg(res.msg, {icon: 2});
- }
- }
- })
- }
-
- function demoSwitch(el) {
- var crnId = el.split("-")[1];
- var opt;
- if (crnDemoData == null) {
- initDemo();
- }
- for (var i = 0; i<crnDemoData.length; i++) {
- if (Number(crnDemoData[i].crnNo) === Number(crnId)) {
- opt = !crnDemoData[i].demo;
- }
- }
- layer.confirm(crnId + ' 鍙峰爢鍨涙満纭畾'+ (opt?'寮�濮�':'鍋滄') + '婕旂ず鍚楋紵', function(){
- doDemo(crnId, 'root', opt); // 鍋滄wcs绯荤粺
- });
- }
-
- function doDemo(crnId, password, opt) {
- // 鍔犺浇tips
- var index = layer.load(1, {
- shade: [0.1,'#fff']
- });
- $.ajax({
- url: baseUrl+ "/crn/demo/switch",
- headers: {'token': localStorage.getItem('token')},
- // async: false,
- data: {
- crnId: Number(crnId),
- password: password,
- opt: opt
- },
- method: 'POST',
- success: function (res) {
- layer.close(index);
- if (res.code === 200){
- layer.msg(res.msg, {icon: 1});
- } else if (res.code === 403){
- window.location.href = baseUrl+"/login";
- } else {
- layer.msg(res.msg, {icon: 2});
- }
- }
- });
-
- }
-
-</script>
-</html>
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 29445b6..5d362b2 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -15,12 +15,7 @@
<div class="nav">
<ul class="cl-effect-4">
<li><a id="console" onclick="nav(this.id)" class="nav-select" href="#">涓�妤间竴鍖�</a></li>
- <li><a id="console12" onclick="nav(this.id)" class="nav-select" href="#">涓�妤间簩鍖�</a></li>
- <li><a id="console21" onclick="nav(this.id)" class="nav-select" href="#">浜屾ゼ涓�鍖�</a></li>
- <li><a id="console22" onclick="nav(this.id)" class="nav-select" href="#">浜屾ゼ浜屽尯</a></li>
- <li><a id="console23" onclick="nav(this.id)" class="nav-select" href="#">浜屾ゼ涓夊尯</a></li>
<li><a id="pipeline" onclick="nav(this.id)" class="nav-unselect" href="#">杈撻�佽澶�</a></li>
- <li><a id="crn" onclick="nav(this.id)" class="nav-unselect" href="#">鍫嗗灈鏈�</a></li>
<li><a id="rgv" onclick="nav(this.id)" class="nav-unselect" href="#">RGV</a></li>
<li><a id="ste" onclick="nav(this.id)" class="nav-unselect" href="#">绌挎杞�</a></li>
</ul>
--
Gitblit v1.9.1