From 27042edaafc246ddd30b2453a2e9d11b7687800f Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期一, 23 八月 2021 08:13:19 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/FullStoreParam.java | 6 +++---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 5 ++++-
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 2 ++
src/main/java/com/zy/asrs/entity/WrkDetl.java | 3 +--
src/main/java/com/zy/asrs/entity/MatCodeCountDto.java | 8 ++++----
5 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java b/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java
index 2c54a19..3aa4596 100644
--- a/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java
+++ b/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java
@@ -7,7 +7,7 @@
private String billNo;
- private String seqNo;
+ private Integer seqNo;
private String matNo;
@@ -21,7 +21,7 @@
this.count = count;
}
- public MatCodeCountDto(String billNo, String seqNo, String matNo, Double count) {
+ public MatCodeCountDto(String billNo, Integer seqNo, String matNo, Double count) {
this.matNo = matNo;
this.count = count;
this.billNo = billNo;
@@ -32,9 +32,9 @@
public void setBillNo(String billNo) { this.billNo = billNo; }
- public String getSeqNo() { return seqNo; }
+ public Integer getSeqNo() { return seqNo; }
- public void setSeqNo(String seqNo) { this.seqNo = seqNo; }
+ public void setSeqNo(Integer seqNo) { this.seqNo = seqNo; }
public String getMatNo() {
return matNo;
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index dcad104..584ce60 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -3,7 +3,6 @@
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;
@@ -67,7 +66,7 @@
*/
@ApiModelProperty(value= "搴忓彿")
@TableField("seq_no")
- private String seqNo;
+ private Integer seqNo;
/**
* 浠撳簱鍙�
diff --git a/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java b/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
index 1007745..0662da5 100644
--- a/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
@@ -22,7 +22,7 @@
private String billNo;
//搴忓彿
- private String seqNo;
+ private Integer seqNo;
// 浜у搧缂栧彿
private String matNo;
@@ -34,9 +34,9 @@
public void setBillNo(String billNo) { this.billNo = billNo; }
- public String getSeqNo() { return seqNo; }
+ public Integer getSeqNo() { return seqNo; }
- public void setSeqNo(String seqNo) { this.seqNo = seqNo; }
+ public void setSeqNo(Integer seqNo) { this.seqNo = seqNo; }
public String getMatNo() {
return matNo;
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
index 42bf0ae..a4c1ff4 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -40,6 +40,8 @@
wrkDetl.setIoTime(new Date());
wrkDetl.setQty(dto.getCount()); // 鏁伴噺
VersionUtils.setWrkDetl(wrkDetl, matCode); // 鐗堟湰鎺у埗
+ wrkDetl.setBillNo("0");
+ wrkDetl.setSeqNo(0);
wrkDetl.setZpallet(barcode); // 鎵樼洏鏉＄爜
wrkDetl.setAppeUser(userId);
wrkDetl.setAppeTime(new Date());
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index c34bd07..7953d20 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -96,7 +96,7 @@
}
}
// 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> 2
- if(!"0".equals(wrkDetl.getBillNo()) || !"0".equals(wrkDetl.getSeqNo())){
+ if(!"0".equals(wrkDetl.getBillNo()) || !wrkDetl.getSeqNo().equals(0)){
WaitMatin waitMatin = waitMatinService.selectOne(new EntityWrapper<WaitMatin>().eq("bill_no",wrkDetl.getBillNo()).eq("seq_no",wrkDetl.getSeqNo()));
if(null != waitMatin && waitMatin.getInQty() >= waitMatin.getQty()){
waitMatin.setIoStatus(2);
@@ -109,6 +109,9 @@
}
//todo:鎻掑叆鍥炴姤妗�
+ if("Y".equals(wrkMast.getLinkMis())){
+
+ }
// try {
// WaitPakin setParam = new WaitPakin();
// setParam.setIoStatus("Y");
--
Gitblit v1.9.1