From a662099c1fdd8d3e6da2d6b167758a4bc548ccff Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期一, 07 四月 2025 17:17:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/glccwcs' into glccwcs
---
src/main/java/com/zy/asrs/mapper/DevpTaskMapper.java | 18 +
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 88 ++++++
src/main/java/com/zy/asrs/entity/DevpTask.java | 247 ++++++++++++++++++++
src/main/java/com/zy/core/MainProcess.java | 4
src/main/java/com/zy/asrs/entity/DevpTaskLog.java | 332 +++++++++++++++++++++++++++
5 files changed, 678 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/DevpTask.java b/src/main/java/com/zy/asrs/entity/DevpTask.java
new file mode 100644
index 0000000..bdc21cd
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/DevpTask.java
@@ -0,0 +1,247 @@
+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.BasWrkStatusService;
+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("wcs_devp_task")
+public class DevpTask implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * wms浠诲姟鍙�
+ */
+ @ApiModelProperty(value = "wms浠诲姟鍙�")
+ @TableId(value = "task_no", type = IdType.INPUT)
+ @TableField("task_no")
+ private String taskNo;
+
+ /**
+ * 浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 瀹岀粨 4: 鍙栨秷
+ */
+ @ApiModelProperty(value = "浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 5: 瀹岀粨 4: 鍙栨秷 ")
+ private Integer status;
+
+ /**
+ * 浠诲姟鍙�
+ */
+ @ApiModelProperty(value = "浠诲姟鍙�")
+ @TableField("wrk_no")
+ private Integer wrkNo;
+
+ /**
+ * 浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)
+ */
+ @ApiModelProperty(value = "浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)")
+ @TableField("create_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+
+ /**
+ * 璧风偣
+ */
+ @ApiModelProperty(value = "璧风偣")
+ @TableField("start_point")
+ private String startPoint;
+
+ /**
+ * 缁堢偣
+ */
+ @ApiModelProperty(value = "缁堢偣")
+ @TableField("target_point")
+ private String targetPoint;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value = "淇敼浜哄憳")
+ @TableField("modi_user")
+ private Long modiUser;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value = "淇敼鏃堕棿")
+ @TableField("modi_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date modiTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value = "澶囨敞")
+ private String memo;
+
+ /**
+ * 鏉＄爜
+ */
+ @ApiModelProperty(value = "鏉＄爜")
+ private String barcode;
+
+ /**
+ * 娲惧彂鏃堕棿
+ */
+ @ApiModelProperty(value = "娲惧彂鏃堕棿")
+ @TableField("assign_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date assignTime;
+
+ /**
+ * 鎵ц鏃堕棿
+ */
+ @ApiModelProperty(value = "鎵ц鏃堕棿")
+ @TableField("execute_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date executeTime;
+
+ /**
+ * 瀹岀粨鏃堕棿
+ */
+ @ApiModelProperty(value = "瀹岀粨鏃堕棿")
+ @TableField("complete_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date completeTime;
+
+ /**
+ * 鍙栨秷鏃堕棿
+ */
+ @ApiModelProperty(value = "鍙栨秷鏃堕棿")
+ @TableField("cancel_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date cancelTime;
+
+ /**
+ * 宸ヤ綔鐘舵��
+ */
+ @ApiModelProperty(value = "宸ヤ綔鐘舵��")
+ @TableField("wrk_sts")
+ private Integer wrkSts;
+
+
+ public DevpTask() {
+ }
+
+
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
+ case 1:
+ return "鎺ユ敹";
+ case 2:
+ return "娲惧彂";
+ case 3:
+ return "姝ュ簭瀹屾垚";
+ case 4:
+ return "鍙栨秷";
+ case 5:
+ return "瀹岀粨";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+
+ 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 getAssignTime$() {
+ if (Cools.isEmpty(this.assignTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.assignTime);
+ }
+
+ public String getExecuteTime$() {
+ if (Cools.isEmpty(this.executeTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.executeTime);
+ }
+
+ public String getCompleteTime$() {
+ if (Cools.isEmpty(this.completeTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.completeTime);
+ }
+
+ public String getCancelTime$() {
+ if (Cools.isEmpty(this.cancelTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.cancelTime);
+ }
+
+ public String getWrkSts$() {
+ BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
+ BasWrkStatus basWrkStatus = service.selectById(this.wrkSts);
+ if (!Cools.isEmpty(basWrkStatus)) {
+ return String.valueOf(basWrkStatus.getWrkDesc());
+ }
+ return null;
+ }
+
+ /**
+ * 鑾峰彇鎸佺画鏃堕棿
+ */
+ public String getDurationTime() {
+ if (Cools.isEmpty(this.createTime)) {
+ return "";
+ }
+
+ Date endDate = new Date();
+ if (!Cools.isEmpty(this.assignTime)) {
+ endDate = this.assignTime;
+ }
+
+ //鐢ㄦ潵鑾峰彇涓や釜鏃堕棿鐩稿樊鐨勬绉掓暟
+ long l = this.createTime.getTime() - endDate.getTime();
+
+ //鍒嗗埆璁＄畻鐩稿樊鐨勫ぉ銆佸皬鏃躲�佸垎銆佺
+ long day = l / (24 * 60 * 60 * 1000);
+ long hour = (l / (60 * 60 * 1000) - day * 24);
+ long min = ((l / (60 * 1000)) - day * 24 * 60 - hour * 60);
+ long s = (l / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - min * 60);
+
+ return Math.abs(day) + "澶�" + Math.abs(hour) + "灏忔椂" + Math.abs(min) + "鍒�" + Math.abs(s) + "绉�";
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/DevpTaskLog.java b/src/main/java/com/zy/asrs/entity/DevpTaskLog.java
new file mode 100644
index 0000000..3a45eab
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/DevpTaskLog.java
@@ -0,0 +1,332 @@
+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.asrs.service.BasWrkIotypeService;
+import com.zy.asrs.service.BasWrkStatusService;
+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("wcs_devp_task_log")
+public class DevpTaskLog implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * wms浠诲姟鍙�
+ */
+ @ApiModelProperty(value = "wms浠诲姟鍙�")
+ @TableField("task_no")
+ private String taskNo;
+
+ /**
+ * 浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 瀹岀粨 4: 鍙栨秷
+ */
+ @ApiModelProperty(value = "浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 瀹岀粨 4: 鍙栨秷 ")
+ private Integer status;
+
+ /**
+ * 浠诲姟鍙�
+ */
+ @ApiModelProperty(value = "浠诲姟鍙�")
+ @TableField("wrk_no")
+ private Integer wrkNo;
+
+ /**
+ * 浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)
+ */
+ @ApiModelProperty(value = "浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)")
+ @TableField("create_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 浠诲姟绫诲瀷
+ */
+ @ApiModelProperty(value = "浠诲姟绫诲瀷")
+ @TableField("io_type")
+ private Integer ioType;
+
+ /**
+ * 浼樺厛绾�
+ */
+ @ApiModelProperty(value = "浼樺厛绾�")
+ @TableField("io_pri")
+ private Double ioPri;
+
+ /**
+ * 璧风偣
+ */
+ @ApiModelProperty(value = "璧风偣")
+ @TableField("start_point")
+ private String startPoint;
+
+ /**
+ * 缁堢偣
+ */
+ @ApiModelProperty(value = "缁堢偣")
+ @TableField("target_point")
+ private String targetPoint;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value = "淇敼浜哄憳")
+ @TableField("modi_user")
+ private Long modiUser;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value = "淇敼鏃堕棿")
+ @TableField("modi_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date modiTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value = "澶囨敞")
+ private String memo;
+
+ /**
+ * 鏉＄爜
+ */
+ @ApiModelProperty(value = "鏉＄爜")
+ private String barcode;
+
+ /**
+ * 娲惧彂鏃堕棿
+ */
+ @ApiModelProperty(value = "娲惧彂鏃堕棿")
+ @TableField("assign_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date assignTime;
+
+ /**
+ * 鎵ц鏃堕棿
+ */
+ @ApiModelProperty(value = "鎵ц鏃堕棿")
+ @TableField("execute_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date executeTime;
+
+ /**
+ * 瀹岀粨鏃堕棿
+ */
+ @ApiModelProperty(value = "瀹岀粨鏃堕棿")
+ @TableField("complete_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date completeTime;
+
+ /**
+ * 鍙栨秷鏃堕棿
+ */
+ @ApiModelProperty(value = "鍙栨秷鏃堕棿")
+ @TableField("cancel_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date cancelTime;
+
+ /**
+ * 宸ヤ綔鐘舵��
+ */
+ @ApiModelProperty(value = "宸ヤ綔鐘舵��")
+ @TableField("wrk_sts")
+ private Integer wrkSts;
+
+ /**
+ * 鍫嗗灈鏈哄彿
+ */
+ @ApiModelProperty(value = "鍫嗗灈鏈哄彿")
+ @TableField("crn_no")
+ private Integer crnNo;
+
+ /**
+ * 鎸囦护鎵ц姝ュ簭
+ */
+ @ApiModelProperty(value = "鎸囦护鎵ц姝ュ簭")
+ @TableField("command_step")
+ private Integer commandStep;
+
+// @ApiModelProperty(value= "")
+// @TableId(value = "id", type = IdType.AUTO)
+// private Long id;
+
+
+ @ApiModelProperty(value = "绉诲簱鏍囪")
+ @TableField("transfer_mark")
+ private Integer transferMark;
+
+ public DevpTaskLog() {
+ }
+
+ public DevpTaskLog(String taskNo, Integer status, Integer wrkNo, Date createTime, Integer ioType, Double ioPri, String startPoint, String targetPoint, Long modiUser, Date modiTime, String memo, String barcode, Date assignTime, Date executeTime, Date completeTime, Date cancelTime, Integer wrkSts, Integer crnNo, Integer commandStep) {
+ this.taskNo = taskNo;
+ this.status = status;
+ this.wrkNo = wrkNo;
+ this.createTime = createTime;
+ this.ioType = ioType;
+ this.ioPri = ioPri;
+ this.startPoint = startPoint;
+ this.targetPoint = targetPoint;
+ this.modiUser = modiUser;
+ this.modiTime = modiTime;
+ this.memo = memo;
+ this.barcode = barcode;
+ this.assignTime = assignTime;
+ this.executeTime = executeTime;
+ this.completeTime = completeTime;
+ this.cancelTime = cancelTime;
+ this.wrkSts = wrkSts;
+ this.crnNo = crnNo;
+ this.commandStep = commandStep;
+ }
+
+ public DevpTaskLog(TaskWrk taskWrk) {
+ this.taskNo = taskWrk.getTaskNo();
+ this.status = taskWrk.getStatus();
+ this.wrkNo = taskWrk.getWrkNo();
+ this.createTime = taskWrk.getCreateTime();
+ this.ioType = taskWrk.getIoType();
+ if (Cools.isEmpty(taskWrk.getIoPri())) {
+ taskWrk.setIoPri(1);
+ }
+ this.ioPri = (double) taskWrk.getIoPri();
+ this.startPoint = taskWrk.getStartPoint();
+ this.targetPoint = taskWrk.getTargetPoint();
+ this.modiUser = taskWrk.getModiUser();
+ this.modiTime = taskWrk.getModiTime();
+ this.memo = taskWrk.getMemo();
+ this.barcode = taskWrk.getBarcode();
+ this.assignTime = taskWrk.getAssignTime();
+ this.executeTime = taskWrk.getExecuteTime();
+ this.completeTime = taskWrk.getCompleteTime();
+ this.cancelTime = taskWrk.getCancelTime();
+ this.wrkSts = taskWrk.getWrkSts();
+ this.crnNo = taskWrk.getCrnNo();
+ this.commandStep = taskWrk.getCommandStep();
+ }
+// TaskWrkLog taskWrkLog = new TaskWrkLog(
+// null, // wms浠诲姟鍙�
+// null, // 浠诲姟鐘舵��
+// null, // 浠诲姟鍙�
+// null, // 浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)
+// null, // 浠诲姟绫诲瀷
+// null, // 浼樺厛绾�
+// null, // 璧风偣
+// null, // 缁堢偣
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 澶囨敞
+// null, // 鏉＄爜
+// null, // 娲惧彂鏃堕棿
+// null, // 鎵ц鏃堕棿
+// null, // 瀹岀粨鏃堕棿
+// null, // 鍙栨秷鏃堕棿
+// null, // 宸ヤ綔鐘舵��
+// null, // 鍫嗗灈鏈哄彿
+// null, // 鎸囦护鎵ц姝ュ簭
+
+// );
+
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
+ case 1:
+ return "鎺ユ敹";
+ case 2:
+ return "娲惧彂";
+ case 3:
+ return "姝ュ簭瀹屾垚";
+ case 4:
+ return "鍙栨秷";
+ case 5:
+ return "瀹岀粨";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getIoType$() {
+ BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
+ BasWrkIotype basWrkIotype = service.selectById(this.ioType);
+ if (!Cools.isEmpty(basWrkIotype)) {
+ return String.valueOf(basWrkIotype.getIoDesc());
+ }
+ return null;
+ }
+
+ 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 getAssignTime$() {
+ if (Cools.isEmpty(this.assignTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.assignTime);
+ }
+
+ public String getExecuteTime$() {
+ if (Cools.isEmpty(this.executeTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.executeTime);
+ }
+
+ public String getCompleteTime$() {
+ if (Cools.isEmpty(this.completeTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.completeTime);
+ }
+
+ public String getCancelTime$() {
+ if (Cools.isEmpty(this.cancelTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.cancelTime);
+ }
+
+ public String getWrkSts$() {
+ BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
+ BasWrkStatus basWrkStatus = service.selectById(this.wrkSts);
+ if (!Cools.isEmpty(basWrkStatus)) {
+ return String.valueOf(basWrkStatus.getWrkDesc());
+ }
+ return null;
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/DevpTaskMapper.java b/src/main/java/com/zy/asrs/mapper/DevpTaskMapper.java
new file mode 100644
index 0000000..2b8c587
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/DevpTaskMapper.java
@@ -0,0 +1,18 @@
+package com.zy.asrs.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.DevpTask;
+import com.zy.asrs.entity.TaskWrk;
+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 DevpTaskMapper extends BaseMapper<DevpTask> {
+
+
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 4bed00e..381cb5d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -10,10 +10,7 @@
import com.zy.asrs.domain.param.CrnOperatorParam;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.wms.StorageEscalationParam;
-import com.zy.asrs.mapper.BasCrnErrorMapper;
-import com.zy.asrs.mapper.StaDescMapper;
-import com.zy.asrs.mapper.TaskWrkMapper;
-import com.zy.asrs.mapper.WrkMastMapper;
+import com.zy.asrs.mapper.*;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.core.CrnThread;
@@ -67,6 +64,9 @@
private BasCrnErrorMapper basCrnErrorMapper;
@Autowired
private TaskWrkMapper taskWrkMapper;
+
+ @Autowired
+ private DevpTaskMapper devpTaskMapper;
@Autowired
private TaskWrkService taskWrkService;
@@ -84,9 +84,6 @@
@Autowired
private CrnController crnController;
-
- @Autowired
- private TransferTaskService transferTaskService;
public void generateStoreWrkFile1() throws IOException, InterruptedException {
@@ -420,6 +417,15 @@
if (flag) {
LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("row1", (locMast.getRow1() - 1))
+ .eq("bay1", locMast.getBay1())
+ .eq("lev1", locMast.getLev1()).eq("loc_sts", "F"));
+ if (!Cools.isEmpty(locMast1)) {
+ log.info(locMast.getLocNo() + "鍑烘繁搴撲綅锛屾祬搴撲綅鏈夎揣");
+ continue;
+ }
+ } else {
+ LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1", (locMast.getRow1() + 1))
.eq("bay1", locMast.getBay1())
.eq("lev1", locMast.getLev1()).eq("loc_sts", "F"));
if (!Cools.isEmpty(locMast1)) {
@@ -830,9 +836,6 @@
try {
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
for (DevpSlave devp : slaveProperties.getDevp()) {
- if (devp.getId() == 2) {
- continue;
- }
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
for (DevpSlave.Sta inSta : devp.getInSta()) {
WrkMast pakout = wrkMastMapper.selectWorkingPakout(inSta.getBackSta());
@@ -993,6 +996,71 @@
/**
+ * 鐙珛杈撻�佺嚎
+ */
+ public void onlyDevp() {
+ DevpSlave devpSlave = slaveProperties.getDevp().get(1);
+ List<DevpSlave.Sta> inSta = devpSlave.getInSta();
+ // 鑾峰彇鍫嗗灈鏈哄嚭搴撶珯淇℃伅
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devpSlave.getId());
+ for (DevpSlave.Sta sta : inSta) {
+ try {
+ StaProtocol staProtocol = devpThread.getStation().get(sta.getStaNo());
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == 0)) {
+ // 鏌ヨ宸ヤ綔妗�
+// TaskWrk taskWrk = devpTaskMapper.selectCrnStaWorking(crnSlave.getId(), staDesc.getStnNo().toString());
+// if (taskWrk == null) {
+// continue;
+// }
+// log.info("涓嬪彂杈撻�佺嚎浠诲姟锛歵askWrk:" + JSON.toJSONString(taskWrk));
+// staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
+// staProtocol.setStaNo(staDesc.getStnNo().shortValue());
+// boolean offer = false;
+// try {
+// offer = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
+// } catch (Exception e) {
+// log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛氬紓甯�:" + e);
+// log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛氬紓甯�:offer:" + offer);
+// }
+// if (offer) {
+// log.info("涓嬪彂杈撻�佺嚎浠诲姟鎴愬姛锛歵askWrk:" + JSON.toJSONString(taskWrk));
+// taskWrk.setStatus(5);
+// taskWrk.setWrkSts(14);
+// taskWrkService.updateById(taskWrk);
+//
+// } else {
+// log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛歵askWrk:" + JSON.toJSONString(taskWrk));
+// }
+ }
+ } catch (Exception e) {
+ log.error("鍑哄簱鍒板嚭搴撶珯寮傚父:寮傚父淇℃伅锛�" + e);
+ }
+ }
+
+ }
+
+
+ /**
+ * 璺戝簱绋嬪簭
+ */
+ public void debug() {
+ //棣栧厛搴撲綅鏈変竴涓湪搴撶殑搴撲綅
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "F"));
+ if (locMast != null) {
+ // 鍐嶇敓鎴愪竴涓Щ搴撲换鍔�
+ LocMast mk = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "O").ne("mk", 1));
+
+ }
+
+ }
+
+
+ /**
* 杞Щ浠诲姟涓嬪彂
*/
public void transferTaskStart() {
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index ce0cd92..decaf4d 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -39,10 +39,12 @@
if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
continue;
}
+ // 璺戝簱绋嬪簭
+ //mainService.debug();
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
- mainService.generateStoreWrkFile1(); // 缁勬墭
+ mainService.generateStoreWrkFile(); // 缁勬墭
// 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
mainService.crnStnToOutStn();
// 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
--
Gitblit v1.9.1