From 6f4cc4d13155e22a84a4117f3773e768da40ded4 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期五, 14 五月 2021 13:12:53 +0800
Subject: [PATCH] 1.出库生成工作档时添加记录条码数据
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
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 80c6c09..6f83e3f 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -111,7 +111,7 @@
List<MatCodeCountDto> matDtos = new ArrayList<>();
if (Cools.isEmpty(param.getProductCode())) {
param.getList().forEach(elem -> {
- matDtos.add(new MatCodeCountDto(elem.getMatNo(), elem.getCount(), elem.getMatStatus()));
+ matDtos.add(new MatCodeCountDto(elem.getMatNo(), elem.getCount(), elem.getMatStatus(), elem.getStr5(), elem.getStr6()));
});
wrkDetlService.createWorkDetail(workNo, matDtos, param.getBarcode(), userId);
// 鎴愬搧鐗╂枡
@@ -237,6 +237,7 @@
wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
wrkMast.setSourceLocNo(dto.getLocNo()); // 婧愬簱浣�
+ wrkMast.setBarcode(locMast.getBarcode()); // 鏉＄爜
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
@@ -419,6 +420,11 @@
if (null != one) locDetlDtos.add(new LocDetlDto(one, one.getAnfme()));
}
}
+ for (LocDetlDto e: locDetlDtos) {
+ if (Cools.isEmpty(e.getLocDetl().getZpallet())) {
+ throw new CoolException("鎵樼洏鐮佷负绌轰笉鍏佽鐩樼偣,搴撲綅鍙�" + e.getLocDetl().getLocNo());
+ }
+ }
if (!locDetlDtos.isEmpty()) {
// 鍚姩鍑哄簱寮�濮� 107.鐩樼偣鍑哄簱
stockOut(staNo, locDetlDtos, 107, userId);
--
Gitblit v1.9.1