From 8785249f17d3f05035ef4a81452963c957253df9 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 01 四月 2025 13:52:34 +0800
Subject: [PATCH] 修复拣料功能
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 4 ++--
src/main/java/com/zy/asrs/entity/result/MatDto.java | 7 ++++++-
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 3 +++
src/main/java/com/zy/common/web/WcsController.java | 10 +++++++---
src/main/java/com/zy/asrs/controller/TVController.java | 1 -
5 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TVController.java b/src/main/java/com/zy/asrs/controller/TVController.java
index ab53703..36a415b 100644
--- a/src/main/java/com/zy/asrs/controller/TVController.java
+++ b/src/main/java/com/zy/asrs/controller/TVController.java
@@ -282,7 +282,6 @@
wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(),wrkDetl.getWeight(),wrkDetl.getSpecs(),wrkDetl.getModel())));
}
commands.add(ledCommand);
-
return R.ok().add(commands);
}
diff --git a/src/main/java/com/zy/asrs/entity/result/MatDto.java b/src/main/java/com/zy/asrs/entity/result/MatDto.java
index f9624d8..b9cd056 100644
--- a/src/main/java/com/zy/asrs/entity/result/MatDto.java
+++ b/src/main/java/com/zy/asrs/entity/result/MatDto.java
@@ -1,5 +1,6 @@
package com.zy.asrs.entity.result;
+import com.core.common.Cools;
import lombok.Data;
/**
@@ -25,6 +26,7 @@
//鍥惧彿
private String model;
+
public MatDto() {
}
@@ -33,12 +35,14 @@
this.maknx = maknx;
this.count = count;
}
+
public MatDto(String matNo, String maknx, Double count, String specs) {
this.specs = specs;
this.matnr = matNo;
this.maknx = maknx;
this.count = count;
}
+
public MatDto(String matNo, String maknx, Double count, Double total, String specs) {
this.specs = specs;
this.matnr = matNo;
@@ -46,7 +50,8 @@
this.count = count;
this.total = total;
}
- public MatDto(String matNo, String maknx, Double count, Double total, String specs,String model) {
+
+ public MatDto(String matNo, String maknx, Double count, Double total, String specs, String model) {
this.specs = specs;
this.matnr = matNo;
this.maknx = maknx;
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index a254a5c..e8c6fb6 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -260,6 +260,8 @@
wrkDetl.setIoTime(now);
Double anfme = ioType==101?detlDto.getLocDetl().getAnfme():detlDto.getCount();
wrkDetl.setAnfme(anfme); // 鏁伴噺
+ wrkDetl.setPrice(detlDto.getLocDetl().getAnfme());//鎬绘暟
+ wrkDetl.setWeight(detlDto.getLocDetl().getAnfme());//鎬绘暟
wrkDetl.setAppeTime(now);
wrkDetl.setAppeUser(userId);
wrkDetl.setModiTime(now);
@@ -344,6 +346,7 @@
wrkDetl.setModel(mat.getModel());
wrkDetl.setPrice(locDetl.getAnfme());//搴撳瓨鏁伴噺
wrkDetl.setAnfme(locDto.getAnfme()); // 鏁伴噺
+ wrkDetl.setWeight(locDetl.getAnfme());//鎬绘暟
wrkDetl.setAppeTime(now);
wrkDetl.setAppeUser(userId);
wrkDetl.setModiTime(now);
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 62ed062..bca1468 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -263,8 +263,8 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鐩樼偣鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
- // 淇敼搴撲綅鐘舵�� Q ====>> F
- if (locMast.getLocSts().equals("Q")) {
+ // 淇敼搴撲綅鐘舵�� S ====>> F
+ if (locMast.getLocSts().equals("S")) {
locMast.setLocSts(wrkMast.getFullPlt().equals("Y")?"F":"D");
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index c74b117..d293842 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -58,15 +58,19 @@
WrkMast wrkMast =wrkMastService.selectOne(new EntityWrapper<WrkMast>()
.eq("wrk_no",param.getTaskNo())
.in("io_type",103,107));
- if (Cools.isEmpty(wrkMast)){
+ WrkMast wrkMast537 =wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+ .eq("wrk_no",param.getTaskNo())
+ .in("io_type",53,57));
+ if (Cools.isEmpty(wrkMast)&&Cools.isEmpty(wrkMast537)){
storageResult.setReturnStatus(1);
storageResult.setErrorMessage("娌℃湁鎵惧埌鐩樼偣鎷ｆ枡浠诲姟---------"+param.getTaskNo());
return storageResult;
}
+
SearchLocParam searchLocParam = new SearchLocParam();
- searchLocParam.setBoxNo(wrkMast.getBarcode());
+ searchLocParam.setBoxNo(Cools.isEmpty(wrkMast)?wrkMast537.getBarcode() : wrkMast.getBarcode());
searchLocParam.setWcsIoType(1);//婊℃澘
- searchLocParam.setWcsSourceStaNo(wrkMast.getStaNo());
+ searchLocParam.setWcsSourceStaNo(Cools.isEmpty(wrkMast)?wrkMast537.getSourceStaNo() : wrkMast.getStaNo());
searchLocParam.setWcsStatus(0);
return getLocNo(searchLocParam);
}
--
Gitblit v1.9.1