From 2a7cc6362c30860c2f18a808b159dda2109fd728 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 14 八月 2020 16:48:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/BasWrkIotype.java | 181 ++++++++
src/main/java/com/zy/asrs/controller/ConsoleController.java | 148 ++++--
src/main/resources/mapper/BasWrkIotypeMapper.xml | 17
src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java | 115 ----
src/main/webapp/views/console.html | 1
src/main/java/com/zy/asrs/entity/BasWrkStatus.java | 164 +++++++
src/main/java/com/zy/asrs/entity/WrkMast.java | 563 -------------------------
src/main/java/com/zy/asrs/mapper/BasWrkStatusMapper.java | 12
src/main/java/com/zy/core/thread/DevpThread.java | 8
src/main/resources/mapper/BasWrkStatusMapper.xml | 16
src/main/java/com/zy/asrs/mapper/BasWrkIotypeMapper.java | 12
11 files changed, 527 insertions(+), 710 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 114310d..542a597 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -6,6 +6,10 @@
import com.zy.asrs.domain.enums.SiteStatusType;
import com.zy.asrs.domain.param.SystemSwitchParam;
import com.zy.asrs.domain.vo.*;
+import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.WrkMastService;
import com.zy.common.CodeRes;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
@@ -33,6 +37,10 @@
@Autowired
private SlaveProperties slaveProperties;
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private BasDevpService basDevpService;
public static AtomicInteger integer = new AtomicInteger();
@@ -59,62 +67,6 @@
Thread.sleep(2000L);
SystemProperties.WCS_RUNNING_STATUS.set(param.getOperatorType()==1?Boolean.TRUE:Boolean.FALSE);
return R.ok().add(Cools.add("status", SystemProperties.WCS_RUNNING_STATUS.get()));
- }
-
- @PostMapping("/site/detail")
- @ManagerAuth(memo = "杈撻�佽澶囨暟鎹鎯�")
- public R siteDetail(@RequestParam String siteId){
- if (Cools.isEmpty(siteId)){
- return R.parse(CodeRes.EMPTY);
- }
- SiteDetailVo vo = new SiteDetailVo();
- vo.setDevpNo(siteId);
- vo.setWorkNo("9998");
- vo.setWorkStatus("2.璁惧涓婄Щ鍔�");
- vo.setAutoing("Y");
- vo.setLoading("Y");
- vo.setCanining("N");
- vo.setCanouting("Y");
- vo.setIoType("1.鍏ュ簱");
- vo.setSourceStaNo("2303");
- vo.setStaNo("2410");
- vo.setSourceStock("");
- vo.setStock("");
- return R.ok().add(vo);
- }
-
- @PostMapping("/crn/detail")
- @ManagerAuth(memo = "鍫嗗灈鏈鸿澶囨暟鎹鎯�")
- public R crnDetail(@RequestParam String crnNo){
- if (Cools.isEmpty(crnNo)){
- return R.parse(CodeRes.EMPTY);
- }
- CrnDetailVo vo = new CrnDetailVo();
- vo.setCrnNo(crnNo);
- vo.setWorkNo("3387");
- vo.setSourceStaNo("2303");
- vo.setStaNo("2410");
- vo.setWorkStatus("3.鍚婅溅鍏ュ簱涓�");
- vo.setIoType("1.鍏ュ簱");
- vo.setSourceStock("");
- vo.setStock("05050040");
- vo.setCrnStatus("鍙栬揣涓�");
- vo.setError("0");
- return R.ok().add(vo);
- }
-
- @Deprecated
- @PostMapping("/site/update")
- @ManagerAuth(memo = "杈撻�佽澶囨暟鎹慨鏀�")
- public R updateSite(){
- return R.ok();
- }
-
- @Deprecated
- @PostMapping("/crn/update")
- @ManagerAuth(memo = "鍫嗗灈鏈烘暟鎹慨鏀�")
- public R updateCrn(){
- return R.ok();
}
/****************************************************************/
@@ -174,4 +126,88 @@
return R.ok().add(list);
}
+ /****************************************************************/
+ /************************** 璇︽儏鎿嶄綔 ******************************/
+ /****************************************************************/
+
+ @PostMapping("/site/detail")
+ @ManagerAuth(memo = "杈撻�佽澶囨暟鎹鎯�")
+ public R siteDetail(@RequestParam Integer siteId){
+ if (Cools.isEmpty(siteId)){
+ return R.parse(CodeRes.EMPTY);
+ }
+ SiteDetailVo vo = new SiteDetailVo();
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ if (null != devpThread) {
+ StaProtocol staProtocol = devpThread.getStation().get(siteId);
+ if (staProtocol != null) {
+ BasDevp basDevp = basDevpService.selectById(siteId);
+ if (basDevp == null) {
+ return R.error("鏁版嵁搴撶淮鎶ゅ紓甯�");
+ }
+
+ vo.setDevpNo(siteId); // 绔欑偣缂栧彿
+ vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+
+ if (staProtocol.getWorkNo() > 0) {
+ WrkMast wrkMast = wrkMastService.selectById(staProtocol.getWorkNo());
+ if (wrkMast != null) {
+ vo.setWorkStatus(wrkMast.getWrkSts$()); // 宸ヤ綔鐘舵��
+ vo.setIoType(wrkMast.getIoType$()); // 鍏ュ嚭搴撶被鍨�
+ vo.setSourceStaNo(wrkMast.getSourceStaNo$());
+ vo.setStaNo(wrkMast.getStaNo$());
+ vo.setSourceStock(wrkMast.getSourceLocNo$());
+ vo.setStock(wrkMast.getLocNo$());
+ }
+ }
+
+ vo.setAutoing(staProtocol.isAutoing()?"Y":"N"); // 鑷姩
+ vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿
+
+ vo.setCanining(basDevp.getCanining()); // 鑳藉叆
+ vo.setCanouting(basDevp.getCanouting()); // 鑳藉嚭
+
+ return R.ok().add(vo);
+ }
+ }
+ }
+ return R.error();
+
+ }
+
+ @PostMapping("/crn/detail")
+ @ManagerAuth(memo = "鍫嗗灈鏈鸿澶囨暟鎹鎯�")
+ public R crnDetail(@RequestParam String crnNo){
+ if (Cools.isEmpty(crnNo)){
+ return R.parse(CodeRes.EMPTY);
+ }
+ CrnDetailVo vo = new CrnDetailVo();
+ vo.setCrnNo(crnNo);
+ vo.setWorkNo("3387");
+ vo.setSourceStaNo("2303");
+ vo.setStaNo("2410");
+ vo.setWorkStatus("3.鍚婅溅鍏ュ簱涓�");
+ vo.setIoType("1.鍏ュ簱");
+ vo.setSourceStock("");
+ vo.setStock("05050040");
+ vo.setCrnStatus("鍙栬揣涓�");
+ vo.setError("0");
+ return R.ok().add(vo);
+ }
+
+ @Deprecated
+ @PostMapping("/site/update")
+ @ManagerAuth(memo = "杈撻�佽澶囨暟鎹慨鏀�")
+ public R updateSite(){
+ return R.ok();
+ }
+
+ @Deprecated
+ @PostMapping("/crn/update")
+ @ManagerAuth(memo = "鍫嗗灈鏈烘暟鎹慨鏀�")
+ public R updateCrn(){
+ return R.ok();
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java b/src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java
index 1d061bb..3c04b8e 100644
--- a/src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java
@@ -1,19 +1,22 @@
package com.zy.asrs.domain.vo;
+import lombok.Data;
+
/**
* 杈撻�佽澶囪鎯呰鍥惧璞�
* Created by vincent on 2020-06-03
*/
+@Data
public class SiteDetailVo {
// 绔欑偣缂栧彿
- private String devpNo;
+ private Integer devpNo;
// 宸ヤ綔鍙�
- private String workNo;
+ private Short workNo;
// 宸ヤ綔鐘舵��
- private String workStatus;
+ private String workStatus = "";
// 鑷姩
private String autoing;
@@ -28,113 +31,17 @@
private String canouting;
// 鍑哄叆绫诲瀷
- private String ioType;
+ private String ioType = "";
// 婧愮珯
- private String sourceStaNo;
+ private String sourceStaNo = "";
// 鐩爣绔�
- private String staNo;
+ private String staNo = "";
// 婧愬簱浣�
- private String sourceStock;
+ private String sourceStock = "";
// 鐩爣搴撲綅
- private String stock;
-
- public String getDevpNo() {
- return devpNo;
- }
-
- public void setDevpNo(String devpNo) {
- this.devpNo = devpNo;
- }
-
- public String getWorkNo() {
- return workNo;
- }
-
- public void setWorkNo(String workNo) {
- this.workNo = workNo;
- }
-
- public String getWorkStatus() {
- return workStatus;
- }
-
- public void setWorkStatus(String workStatus) {
- this.workStatus = workStatus;
- }
-
- public String getAutoing() {
- return autoing;
- }
-
- public void setAutoing(String autoing) {
- this.autoing = autoing;
- }
-
- public String getLoading() {
- return loading;
- }
-
- public void setLoading(String loading) {
- this.loading = loading;
- }
-
- public String getCanining() {
- return canining;
- }
-
- public void setCanining(String canining) {
- this.canining = canining;
- }
-
- public String getCanouting() {
- return canouting;
- }
-
- public void setCanouting(String canouting) {
- this.canouting = canouting;
- }
-
- public String getIoType() {
- return ioType;
- }
-
- public void setIoType(String ioType) {
- this.ioType = ioType;
- }
-
- public String getSourceStaNo() {
- return sourceStaNo;
- }
-
- public void setSourceStaNo(String sourceStaNo) {
- this.sourceStaNo = sourceStaNo;
- }
-
- public String getStaNo() {
- return staNo;
- }
-
- public void setStaNo(String staNo) {
- this.staNo = staNo;
- }
-
- public String getSourceStock() {
- return sourceStock;
- }
-
- public void setSourceStock(String sourceStock) {
- this.sourceStock = sourceStock;
- }
-
- public String getStock() {
- return stock;
- }
-
- public void setStock(String stock) {
- this.stock = stock;
- }
+ private String stock = "";
}
diff --git a/src/main/java/com/zy/asrs/entity/BasWrkIotype.java b/src/main/java/com/zy/asrs/entity/BasWrkIotype.java
new file mode 100644
index 0000000..91fb456
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasWrkIotype.java
@@ -0,0 +1,181 @@
+package com.zy.asrs.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@TableName("asr_bas_wrk_iotype")
+public class BasWrkIotype implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 鍏ュ嚭绫诲瀷浠ｅ彿
+ */
+ @ApiModelProperty(value= "鍏ュ嚭绫诲瀷浠ｅ彿")
+ @TableId(value = "io_type", type = IdType.INPUT)
+ @TableField("io_type")
+ private Integer ioType;
+
+ /**
+ * 涓昏
+ */
+ @ApiModelProperty(value= "涓昏")
+ @TableField("io_pri")
+ private String ioPri;
+
+ /**
+ * 鍏ュ嚭绫诲瀷鎻忚堪
+ */
+ @ApiModelProperty(value= "鍏ュ嚭绫诲瀷鎻忚堪")
+ @TableField("io_desc")
+ private String ioDesc;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @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;
+
+ public BasWrkIotype() {}
+
+ public BasWrkIotype(String ioPri,String ioDesc,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
+ this.ioPri = ioPri;
+ this.ioDesc = ioDesc;
+ this.modiUser = modiUser;
+ this.modiTime = modiTime;
+ this.appeUser = appeUser;
+ this.appeTime = appeTime;
+ }
+
+// BasWrkIotype basWrkIotype = new BasWrkIotype(
+// null, // 涓昏
+// null, // 鍏ュ嚭绫诲瀷鎻忚堪
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 鍒涘缓鑰�
+// null // 娣诲姞鏃堕棿
+// );
+
+ public Integer getIoType() {
+ return ioType;
+ }
+
+ public void setIoType(Integer ioType) {
+ this.ioType = ioType;
+ }
+
+ public String getIoPri() {
+ return ioPri;
+ }
+
+ public void setIoPri(String ioPri) {
+ this.ioPri = ioPri;
+ }
+
+ public String getIoDesc() {
+ return ioDesc;
+ }
+
+ public void setIoDesc(String ioDesc) {
+ this.ioDesc = ioDesc;
+ }
+
+ public Long getModiUser() {
+ return modiUser;
+ }
+
+ public String getModiUser$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.modiUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public void setModiUser(Long modiUser) {
+ this.modiUser = modiUser;
+ }
+
+ public Date getModiTime() {
+ return modiTime;
+ }
+
+ public String getModiTime$(){
+ if (Cools.isEmpty(this.modiTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
+ }
+
+ public void setModiTime(Date modiTime) {
+ this.modiTime = modiTime;
+ }
+
+ public Long getAppeUser() {
+ return appeUser;
+ }
+
+ public String getAppeUser$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.appeUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public void setAppeUser(Long appeUser) {
+ this.appeUser = appeUser;
+ }
+
+ public Date getAppeTime() {
+ return appeTime;
+ }
+
+ public String getAppeTime$(){
+ if (Cools.isEmpty(this.appeTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
+ }
+
+ public void setAppeTime(Date appeTime) {
+ this.appeTime = appeTime;
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/BasWrkStatus.java b/src/main/java/com/zy/asrs/entity/BasWrkStatus.java
new file mode 100644
index 0000000..c02168d
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasWrkStatus.java
@@ -0,0 +1,164 @@
+package com.zy.asrs.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@TableName("asr_bas_wrk_status")
+public class BasWrkStatus implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 浠ｅ彿
+ */
+ @ApiModelProperty(value= "浠ｅ彿")
+ @TableId(value = "wrk_sts", type = IdType.INPUT)
+ @TableField("wrk_sts")
+ private Long wrkSts;
+
+ /**
+ * 鐘舵�佹弿杩�
+ */
+ @ApiModelProperty(value= "鐘舵�佹弿杩�")
+ @TableField("wrk_desc")
+ private String wrkDesc;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @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;
+
+ public BasWrkStatus() {}
+
+ public BasWrkStatus(String wrkDesc,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
+ this.wrkDesc = wrkDesc;
+ this.modiUser = modiUser;
+ this.modiTime = modiTime;
+ this.appeUser = appeUser;
+ this.appeTime = appeTime;
+ }
+
+// BasWrkStatus basWrkStatus = new BasWrkStatus(
+// null, // 鐘舵�佹弿杩�
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 鍒涘缓鑰�
+// null // 娣诲姞鏃堕棿
+// );
+
+ public Long getWrkSts() {
+ return wrkSts;
+ }
+
+ public void setWrkSts(Long wrkSts) {
+ this.wrkSts = wrkSts;
+ }
+
+ public String getWrkDesc() {
+ return wrkDesc;
+ }
+
+ public void setWrkDesc(String wrkDesc) {
+ this.wrkDesc = wrkDesc;
+ }
+
+ public Long getModiUser() {
+ return modiUser;
+ }
+
+ public String getModiUser$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.modiUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public void setModiUser(Long modiUser) {
+ this.modiUser = modiUser;
+ }
+
+ public Date getModiTime() {
+ return modiTime;
+ }
+
+ public String getModiTime$(){
+ if (Cools.isEmpty(this.modiTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
+ }
+
+ public void setModiTime(Date modiTime) {
+ this.modiTime = modiTime;
+ }
+
+ public Long getAppeUser() {
+ return appeUser;
+ }
+
+ public String getAppeUser$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.appeUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public void setAppeUser(Long appeUser) {
+ this.appeUser = appeUser;
+ }
+
+ public Date getAppeTime() {
+ return appeTime;
+ }
+
+ public String getAppeTime$(){
+ if (Cools.isEmpty(this.appeTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
+ }
+
+ public void setAppeTime(Date appeTime) {
+ this.appeTime = appeTime;
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 2f55604..e896efc 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -6,15 +6,19 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.asrs.mapper.BasWrkIotypeMapper;
+import com.zy.asrs.mapper.BasWrkStatusMapper;
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 java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+@Data
@TableName("asr_wrk_mast")
public class WrkMast implements Serializable {
@@ -304,140 +308,22 @@
@TableField("full_plt")
private String fullPlt;
- public WrkMast() {}
-
- public WrkMast(String invWh,Date ymd,String mk,Integer whsType,Long wrkSts,Integer ioType,Integer crnNo,String sheetNo,Double ioPri,Date wrkDate,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String locSts,String picking,String linkMis,String onlineYn,String updMk,String exitMk,Integer pltType,String emptyMk,Date ioTime,Integer ctnType,String packed,String oveMk,Double mtnType,String userNo,Date crnStrTime,Date crnEndTime,Date plcStrTime,Date crnPosTime,Double loadTime,Double expTime,Double refWrkno,Date refIotime,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String pauseMk,Date errorTime,String errorMemo,Integer ctnKind,String manuType,String memo,Double scWeight,String logMk,Date logErrTime,String logErrMemo,String barcode,String PdcType,String ctnNo,String fullPlt) {
- this.invWh = invWh;
- this.ymd = ymd;
- this.mk = mk;
- this.whsType = whsType;
- this.wrkSts = wrkSts;
- this.ioType = ioType;
- this.crnNo = crnNo;
- this.sheetNo = sheetNo;
- this.ioPri = ioPri;
- this.wrkDate = wrkDate;
- this.locNo = locNo;
- this.staNo = staNo;
- this.sourceStaNo = sourceStaNo;
- this.sourceLocNo = sourceLocNo;
- this.locSts = locSts;
- this.picking = picking;
- this.linkMis = linkMis;
- this.onlineYn = onlineYn;
- this.updMk = updMk;
- this.exitMk = exitMk;
- this.pltType = pltType;
- this.emptyMk = emptyMk;
- this.ioTime = ioTime;
- this.ctnType = ctnType;
- this.packed = packed;
- this.oveMk = oveMk;
- this.mtnType = mtnType;
- this.userNo = userNo;
- this.crnStrTime = crnStrTime;
- this.crnEndTime = crnEndTime;
- this.plcStrTime = plcStrTime;
- this.crnPosTime = crnPosTime;
- this.loadTime = loadTime;
- this.expTime = expTime;
- this.refWrkno = refWrkno;
- this.refIotime = refIotime;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- this.pauseMk = pauseMk;
- this.errorTime = errorTime;
- this.errorMemo = errorMemo;
- this.ctnKind = ctnKind;
- this.manuType = manuType;
- this.memo = memo;
- this.scWeight = scWeight;
- this.logMk = logMk;
- this.logErrTime = logErrTime;
- this.logErrMemo = logErrMemo;
- this.barcode = barcode;
- this.PdcType = PdcType;
- this.ctnNo = ctnNo;
- this.fullPlt = fullPlt;
+ public String getWrkSts$(){
+ BasWrkStatusMapper mapper = SpringUtils.getBean(BasWrkStatusMapper.class);
+ BasWrkStatus entity = mapper.selectById(this.wrkSts);
+ if (entity != null) {
+ return entity.getWrkDesc();
+ }
+ return null;
}
-// WrkMast wrkMast = new WrkMast(
-// null, //
-// null, //
-// null, //
-// null, //
-// null, // 宸ヤ綔鐘舵��
-// null, // 鍏ュ嚭搴撶被鍨�
-// null, // 鍫嗗灈鏈�
-// null, //
-// null, // 浼樺厛绾�
-// null, //
-// null, // 鐩爣搴撲綅
-// null, // 鐩爣绔�
-// null, // 婧愮珯
-// null, // 婧愬簱浣�
-// null, //
-// null, // 鎷ｆ枡
-// null, //
-// null, //
-// null, //
-// null, // 閫�鍑�
-// null, //
-// null, // 绌烘澘
-// null, // 宸ヤ綔鏃堕棿
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, // 鍫嗗灈鏈哄惎鍔ㄦ椂闂�
-// null, // 鍫嗗灈鏈哄仠姝㈡椂闂�
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, // 鎷ｆ枡鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 鍒涘缓鑰�
-// null, // 娣诲姞鏃堕棿
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, // 澶囨敞
-// null, //
-// null, //
-// null, //
-// null, //
-// null, // 鏉＄爜
-// null, //
-// null, //
-// null // 婊℃澘
-// );
-
- public Integer getWrkNo() {
- return wrkNo;
- }
-
- public void setWrkNo(Integer wrkNo) {
- this.wrkNo = wrkNo;
- }
-
- public String getInvWh() {
- return invWh;
- }
-
- public void setInvWh(String invWh) {
- this.invWh = invWh;
- }
-
- public Date getYmd() {
- return ymd;
+ public String getIoType$(){
+ BasWrkIotypeMapper mapper = SpringUtils.getBean(BasWrkIotypeMapper.class);
+ BasWrkIotype entity = mapper.selectById(this.ioType);
+ if (entity != null) {
+ return entity.getIoDesc();
+ }
+ return null;
}
public String getYmd$(){
@@ -445,46 +331,6 @@
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ymd);
- }
-
- public void setYmd(Date ymd) {
- this.ymd = ymd;
- }
-
- public String getMk() {
- return mk;
- }
-
- public void setMk(String mk) {
- this.mk = mk;
- }
-
- public Integer getWhsType() {
- return whsType;
- }
-
- public void setWhsType(Integer whsType) {
- this.whsType = whsType;
- }
-
- public Long getWrkSts() {
- return wrkSts;
- }
-
- public void setWrkSts(Long wrkSts) {
- this.wrkSts = wrkSts;
- }
-
- public Integer getIoType() {
- return ioType;
- }
-
- public void setIoType(Integer ioType) {
- this.ioType = ioType;
- }
-
- public Integer getCrnNo() {
- return crnNo;
}
public String getCrnNo$(){
@@ -496,43 +342,11 @@
return null;
}
- public void setCrnNo(Integer crnNo) {
- this.crnNo = crnNo;
- }
-
- public String getSheetNo() {
- return sheetNo;
- }
-
- public void setSheetNo(String sheetNo) {
- this.sheetNo = sheetNo;
- }
-
- public Double getIoPri() {
- return ioPri;
- }
-
- public void setIoPri(Double ioPri) {
- this.ioPri = ioPri;
- }
-
- public Date getWrkDate() {
- return wrkDate;
- }
-
public String getWrkDate$(){
if (Cools.isEmpty(this.wrkDate)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.wrkDate);
- }
-
- public void setWrkDate(Date wrkDate) {
- this.wrkDate = wrkDate;
- }
-
- public String getLocNo() {
- return locNo;
}
public String getLocNo$(){
@@ -544,14 +358,6 @@
return null;
}
- public void setLocNo(String locNo) {
- this.locNo = locNo;
- }
-
- public Integer getStaNo() {
- return staNo;
- }
-
public String getStaNo$(){
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
BasDevp basDevp = service.selectById(this.staNo);
@@ -559,14 +365,6 @@
return String.valueOf(basDevp.getDevNo());
}
return null;
- }
-
- public void setStaNo(Integer staNo) {
- this.staNo = staNo;
- }
-
- public Integer getSourceStaNo() {
- return sourceStaNo;
}
public String getSourceStaNo$(){
@@ -578,14 +376,6 @@
return null;
}
- public void setSourceStaNo(Integer sourceStaNo) {
- this.sourceStaNo = sourceStaNo;
- }
-
- public String getSourceLocNo() {
- return sourceLocNo;
- }
-
public String getSourceLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.sourceLocNo);
@@ -595,131 +385,11 @@
return null;
}
- public void setSourceLocNo(String sourceLocNo) {
- this.sourceLocNo = sourceLocNo;
- }
-
- public String getLocSts() {
- return locSts;
- }
-
- public void setLocSts(String locSts) {
- this.locSts = locSts;
- }
-
- public String getPicking() {
- return picking;
- }
-
- public void setPicking(String picking) {
- this.picking = picking;
- }
-
- public String getLinkMis() {
- return linkMis;
- }
-
- public void setLinkMis(String linkMis) {
- this.linkMis = linkMis;
- }
-
- public String getOnlineYn() {
- return onlineYn;
- }
-
- public void setOnlineYn(String onlineYn) {
- this.onlineYn = onlineYn;
- }
-
- public String getUpdMk() {
- return updMk;
- }
-
- public void setUpdMk(String updMk) {
- this.updMk = updMk;
- }
-
- public String getExitMk() {
- return exitMk;
- }
-
- public void setExitMk(String exitMk) {
- this.exitMk = exitMk;
- }
-
- public Integer getPltType() {
- return pltType;
- }
-
- public void setPltType(Integer pltType) {
- this.pltType = pltType;
- }
-
- public String getEmptyMk() {
- return emptyMk;
- }
-
- public void setEmptyMk(String emptyMk) {
- this.emptyMk = emptyMk;
- }
-
- public Date getIoTime() {
- return ioTime;
- }
-
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
- }
-
- public void setIoTime(Date ioTime) {
- this.ioTime = ioTime;
- }
-
- public Integer getCtnType() {
- return ctnType;
- }
-
- public void setCtnType(Integer ctnType) {
- this.ctnType = ctnType;
- }
-
- public String getPacked() {
- return packed;
- }
-
- public void setPacked(String packed) {
- this.packed = packed;
- }
-
- public String getOveMk() {
- return oveMk;
- }
-
- public void setOveMk(String oveMk) {
- this.oveMk = oveMk;
- }
-
- public Double getMtnType() {
- return mtnType;
- }
-
- public void setMtnType(Double mtnType) {
- this.mtnType = mtnType;
- }
-
- public String getUserNo() {
- return userNo;
- }
-
- public void setUserNo(String userNo) {
- this.userNo = userNo;
- }
-
- public Date getCrnStrTime() {
- return crnStrTime;
}
public String getCrnStrTime$(){
@@ -729,27 +399,11 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.crnStrTime);
}
- public void setCrnStrTime(Date crnStrTime) {
- this.crnStrTime = crnStrTime;
- }
-
- public Date getCrnEndTime() {
- return crnEndTime;
- }
-
public String getCrnEndTime$(){
if (Cools.isEmpty(this.crnEndTime)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.crnEndTime);
- }
-
- public void setCrnEndTime(Date crnEndTime) {
- this.crnEndTime = crnEndTime;
- }
-
- public Date getPlcStrTime() {
- return plcStrTime;
}
public String getPlcStrTime$(){
@@ -759,14 +413,6 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.plcStrTime);
}
- public void setPlcStrTime(Date plcStrTime) {
- this.plcStrTime = plcStrTime;
- }
-
- public Date getCrnPosTime() {
- return crnPosTime;
- }
-
public String getCrnPosTime$(){
if (Cools.isEmpty(this.crnPosTime)){
return "";
@@ -774,51 +420,11 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.crnPosTime);
}
- public void setCrnPosTime(Date crnPosTime) {
- this.crnPosTime = crnPosTime;
- }
-
- public Double getLoadTime() {
- return loadTime;
- }
-
- public void setLoadTime(Double loadTime) {
- this.loadTime = loadTime;
- }
-
- public Double getExpTime() {
- return expTime;
- }
-
- public void setExpTime(Double expTime) {
- this.expTime = expTime;
- }
-
- public Double getRefWrkno() {
- return refWrkno;
- }
-
- public void setRefWrkno(Double refWrkno) {
- this.refWrkno = refWrkno;
- }
-
- public Date getRefIotime() {
- return refIotime;
- }
-
public String getRefIotime$(){
if (Cools.isEmpty(this.refIotime)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.refIotime);
- }
-
- public void setRefIotime(Date refIotime) {
- this.refIotime = refIotime;
- }
-
- public Long getModiUser() {
- return modiUser;
}
public String getModiUser$(){
@@ -830,27 +436,11 @@
return null;
}
- public void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
- }
-
- public Date getModiTime() {
- return modiTime;
- }
-
public String getModiTime$(){
if (Cools.isEmpty(this.modiTime)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public void setModiTime(Date modiTime) {
- this.modiTime = modiTime;
- }
-
- public Long getAppeUser() {
- return appeUser;
}
public String getAppeUser$(){
@@ -860,10 +450,6 @@
return String.valueOf(user.getUsername());
}
return null;
- }
-
- public void setAppeUser(Long appeUser) {
- this.appeUser = appeUser;
}
public Date getAppeTime() {
@@ -877,35 +463,11 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
- public void setAppeTime(Date appeTime) {
- this.appeTime = appeTime;
- }
-
- public String getPauseMk() {
- return pauseMk;
- }
-
- public void setPauseMk(String pauseMk) {
- this.pauseMk = pauseMk;
- }
-
- public Date getErrorTime() {
- return errorTime;
- }
-
public String getErrorTime$(){
if (Cools.isEmpty(this.errorTime)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
- }
-
- public void setErrorTime(Date errorTime) {
- this.errorTime = errorTime;
- }
-
- public String getErrorMemo() {
- return errorMemo;
}
public void setErrorMemo(String errorMemo) {
@@ -915,100 +477,11 @@
this.errorMemo = errorMemo;
}
- public Integer getCtnKind() {
- return ctnKind;
- }
-
- public void setCtnKind(Integer ctnKind) {
- this.ctnKind = ctnKind;
- }
-
- public String getManuType() {
- return manuType;
- }
-
- public void setManuType(String manuType) {
- this.manuType = manuType;
- }
-
- public String getMemo() {
- return memo;
- }
-
- public void setMemo(String memo) {
- this.memo = memo;
- }
-
- public Double getScWeight() {
- return scWeight;
- }
-
- public void setScWeight(Double scWeight) {
- this.scWeight = scWeight;
- }
-
- public String getLogMk() {
- return logMk;
- }
-
- public void setLogMk(String logMk) {
- this.logMk = logMk;
- }
-
- public Date getLogErrTime() {
- return logErrTime;
- }
-
public String getLogErrTime$(){
if (Cools.isEmpty(this.logErrTime)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime);
}
-
- public void setLogErrTime(Date logErrTime) {
- this.logErrTime = logErrTime;
- }
-
- public String getLogErrMemo() {
- return logErrMemo;
- }
-
- public void setLogErrMemo(String logErrMemo) {
- this.logErrMemo = logErrMemo;
- }
-
- public String getBarcode() {
- return barcode;
- }
-
- public void setBarcode(String barcode) {
- this.barcode = barcode;
- }
-
- public String getPdcType() {
- return PdcType;
- }
-
- public void setPdcType(String PdcType) {
- this.PdcType = PdcType;
- }
-
- public String getCtnNo() {
- return ctnNo;
- }
-
- public void setCtnNo(String ctnNo) {
- this.ctnNo = ctnNo;
- }
-
- public String getFullPlt() {
- return fullPlt;
- }
-
- public void setFullPlt(String fullPlt) {
- this.fullPlt = fullPlt;
- }
-
}
diff --git a/src/main/java/com/zy/asrs/mapper/BasWrkIotypeMapper.java b/src/main/java/com/zy/asrs/mapper/BasWrkIotypeMapper.java
new file mode 100644
index 0000000..50f490d
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasWrkIotypeMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.BasWrkIotype;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasWrkIotypeMapper extends BaseMapper<BasWrkIotype> {
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/BasWrkStatusMapper.java b/src/main/java/com/zy/asrs/mapper/BasWrkStatusMapper.java
new file mode 100644
index 0000000..7432bbc
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasWrkStatusMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.BasWrkStatus;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasWrkStatusMapper extends BaseMapper<BasWrkStatus> {
+
+}
diff --git a/src/main/java/com/zy/core/thread/DevpThread.java b/src/main/java/com/zy/core/thread/DevpThread.java
index b339974..c89b569 100644
--- a/src/main/java/com/zy/core/thread/DevpThread.java
+++ b/src/main/java/com/zy/core/thread/DevpThread.java
@@ -142,10 +142,10 @@
DevpThread devpThread = new DevpThread(slave);
devpThread.read();
// 鍐�
- StaProtocol staProtocol = devpThread.getStation().get(2);
- staProtocol.setWorkNo((short) 0);
- staProtocol.setStaNo((short) 1001);
- staProtocol.setAutoing(true);
+ StaProtocol staProtocol = devpThread.getStation().get(1);
+ staProtocol.setWorkNo((short) 222);
+ staProtocol.setStaNo((short) 2);
+ staProtocol.setAutoing(false);
staProtocol.setEmptyMk(true);
staProtocol.setInEnable(true);
devpThread.write(staProtocol);
diff --git a/src/main/resources/mapper/BasWrkIotypeMapper.xml b/src/main/resources/mapper/BasWrkIotypeMapper.xml
new file mode 100644
index 0000000..814748c
--- /dev/null
+++ b/src/main/resources/mapper/BasWrkIotypeMapper.xml
@@ -0,0 +1,17 @@
+<?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.BasWrkIotypeMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasWrkIotype">
+ <id column="io_type" property="ioType" />
+ <result column="io_pri" property="ioPri" />
+ <result column="io_desc" property="ioDesc" />
+ <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>
+
+</mapper>
diff --git a/src/main/resources/mapper/BasWrkStatusMapper.xml b/src/main/resources/mapper/BasWrkStatusMapper.xml
new file mode 100644
index 0000000..e363bf4
--- /dev/null
+++ b/src/main/resources/mapper/BasWrkStatusMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.mapper.BasWrkStatusMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasWrkStatus">
+ <id column="wrk_sts" property="wrkSts" />
+ <result column="wrk_desc" property="wrkDesc" />
+ <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>
+
+</mapper>
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 5563261..b54b654 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -502,7 +502,6 @@
} else {
siteEl.html(sites[i].siteId);
}
-
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
--
Gitblit v1.9.1