From 16ff02f8884e858d4ed590390d8b64fc7acd4f5a Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期四, 09 九月 2021 11:12:57 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/model/StartupDto.java  |   10 +++++
 src/main/java/com/zy/common/web/WcsController.java |    2 
 src/main/java/com/zy/common/model/LocTypeDto.java  |   54 +++++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
new file mode 100644
index 0000000..ecf4732
--- /dev/null
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -0,0 +1,54 @@
+package com.zy.common.model;
+
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.BasDevp;
+import lombok.Data;
+
+/**
+ * Created by vincent on 2020/10/19
+ */
+@Data
+public class LocTypeDto {
+
+    // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿
+    private Short locType1;
+
+    // 瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿
+    private Short locType2;
+
+    // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
+    private Short locType3;
+
+    public LocTypeDto() {
+    }
+
+    public LocTypeDto(BasDevp basDevp) {
+        if (basDevp.getLocType1() == null || basDevp.getLocType1() == 0) {
+            throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
+        }
+        if (basDevp.getLocType1() == 1) {
+            this.locType1 = 1; // 浣庡簱浣�
+        } else if (basDevp.getLocType1() == 2){
+            this.locType1 = 2; // 涓簱浣�
+        } else {
+            this.locType1 = 3; // 楂樺簱浣�
+        }
+//        if (basDevp.getLocType2() == 0) {
+//            throw new CoolException("plc瀹界獎妫�娴嬪紓甯�");
+//        }
+//        if (basDevp.getLocType2() == 1) {
+//            this.locType2 = 1; // 绐勫簱浣�
+//        } else {
+//            this.locType2 = 2; // 瀹藉簱浣�
+//        }
+//        if (basDevp.getLocType3() == 0) {
+//            throw new CoolException("plc杞婚噸妫�娴嬪紓甯�");
+//        }
+//        if (basDevp.getLocType3() == 1) {
+//            this.locType3 = 1; // 杞诲簱浣�
+//        } else {
+//            this.locType3 = 2; // 閲嶅簱浣�
+//        }
+    }
+
+}
diff --git a/src/main/java/com/zy/common/model/StartupDto.java b/src/main/java/com/zy/common/model/StartupDto.java
index dacec79..304aca3 100644
--- a/src/main/java/com/zy/common/model/StartupDto.java
+++ b/src/main/java/com/zy/common/model/StartupDto.java
@@ -13,6 +13,8 @@
 
     private String locNo;
 
+    private Integer workNo;
+
     public Integer getSourceStaNo() {
         return sourceStaNo;
     }
@@ -44,4 +46,12 @@
     public void setLocNo(String locNo) {
         this.locNo = locNo;
     }
+
+    public Integer getWorkNo() {
+        return workNo;
+    }
+
+    public void setWorkNo(Integer workNo) {
+        this.workNo = workNo;
+    }
 }
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 0b44b24..eb0a9a9 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -97,7 +97,7 @@
         // 婧愮珯鐐圭姸鎬佹娴�
         BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
         // 妫�绱㈠簱浣�
-        List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
+        List<String> matNos = waitPakins.stream().map(WaitPakin::getMatNo).distinct().collect(Collectors.toList());
         StartupDto dto = commonService.getLocNo(null, 1, devpNo, matNos, locTypeDto);
         int workNo = dto.getWorkNo();
 

--
Gitblit v1.9.1