From 846e4079370dbe5c50cf7097a185192b6c0d8421 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 06 三月 2024 14:43:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 3 +++
src/main/java/com/zy/asrs/entity/AgvWaitPakin.java | 18 ++++++++++++++++++
src/main/java/com/zy/asrs/entity/AgvWaitPakinLog.java | 18 ++++++++++++++++++
src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 4 +++-
src/main/java/com/zy/common/model/DetlDto.java | 12 ++++++++++++
5 files changed, 54 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/AgvWaitPakin.java b/src/main/java/com/zy/asrs/entity/AgvWaitPakin.java
index 2dc0a4e..cc6ecb4 100644
--- a/src/main/java/com/zy/asrs/entity/AgvWaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/AgvWaitPakin.java
@@ -151,6 +151,10 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @ApiModelProperty(value= "璐т綅绫诲瀷 1: 寰呭寘瑁呮垚鍝� 2: 鍘熸潗鏂� 3锛氱澹�")
+ @TableField("loc_type")
+ private Integer locType;
+
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
switch (this.beBatch){
@@ -163,6 +167,20 @@
}
}
+ public String getLocType$(){
+ if (null == this.locType){ return null; }
+ switch (this.locType){
+ case 1:
+ return "寰呭寘瑁呮垚鍝�";
+ case 2:
+ return "鍘熸潗鏂�";
+ case 3:
+ return "绠卞３";
+ default:
+ return String.valueOf(this.locType);
+ }
+ }
+
public String getSource$(){
if (null == this.source){ return null; }
switch (this.source){
diff --git a/src/main/java/com/zy/asrs/entity/AgvWaitPakinLog.java b/src/main/java/com/zy/asrs/entity/AgvWaitPakinLog.java
index 28ebb8c..8f7d45e 100644
--- a/src/main/java/com/zy/asrs/entity/AgvWaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/AgvWaitPakinLog.java
@@ -151,6 +151,10 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @ApiModelProperty(value= "璐т綅绫诲瀷 1: 寰呭寘瑁呮垚鍝� 2: 鍘熸潗鏂� 3锛氱澹�")
+ @TableField("loc_type")
+ private Integer locType;
+
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
switch (this.beBatch){
@@ -163,6 +167,20 @@
}
}
+ public String getLocType$(){
+ if (null == this.locType){ return null; }
+ switch (this.locType){
+ case 1:
+ return "寰呭寘瑁呮垚鍝�";
+ case 2:
+ return "鍘熸潗鏂�";
+ case 3:
+ return "绠卞３";
+ default:
+ return String.valueOf(this.locType);
+ }
+ }
+
public String getSource$(){
if (null == this.source){ return null; }
switch (this.source){
diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index ff8690d..0504ed9 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -19,6 +19,9 @@
// 搴撲綅缂栧彿
private String locno;
+ // 搴撲綅绫诲瀷锛� 1銆佸緟鍖呰鎴愬搧锛�2銆佸師鏉愭枡锛�3銆佺澹�
+ private Integer locType;
+
private List<CombMat> combMats;
@Data
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
index 982fcbf..55e753c 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -136,7 +136,7 @@
checkOrderQty(order,combMat);
}
- DetlDto detlDto = new DetlDto(combMat.getMatnr(), combMat.getBatch(), combMat.getAnfme(), combMat.getCsocode(), combMat.getIsoseq(),combMat.getContainerCode());
+ DetlDto detlDto = new DetlDto(combMat.getMatnr(), combMat.getBatch(), combMat.getAnfme(), combMat.getCsocode(), combMat.getIsoseq(),combMat.getContainerCode(),param.getLocType());
//鍚屼竴鎵樼洏涓嬬浉鍚岀墿鏂欎俊鎭拰鎵瑰彿杞负涓�涓叆搴撻�氱煡妗�
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch(), detlDto.getCsocode(), detlDto.getIsoseq(),null);
@@ -191,6 +191,8 @@
//閿�鍞鍗曡鍙�
waitPakin.setDeadTime(detlDto.getIsoseq());
+ waitPakin.setLocType(detlDto.getLocType());
+
waitPakin.setAppeUser(userId);
waitPakin.setAppeTime(now);
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index d58542b..b2bae77 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -30,6 +30,9 @@
//閿�鍞鍗曡鍙�
private String isoseq;
+ // 搴撲綅绫诲瀷锛� 1銆佷唬鍖呰鎴愬搧锛�2銆佸師鏉愭枡锛�3銆佺澹�
+ private Integer locType;
+
public DetlDto() {
}
@@ -57,6 +60,15 @@
this.isoseq = isoseq;
this.containerCode = containerCode;
}
+ public DetlDto(String matnr, String batch, Double anfme, String csocode, String isoseq, String containerCode, Integer locType) {
+ this.matnr = matnr;
+ this.batch = batch;
+ this.anfme = anfme;
+ this.csocode = csocode;
+ this.isoseq = isoseq;
+ this.containerCode = containerCode;
+ this.locType = locType;
+ }
public DetlDto(String orderNo, String matnr, String batch, Double anfme, String csocode, String isoseq) {
this.orderNo = orderNo;
--
Gitblit v1.9.1