From 1918c5fe8c390ca90acff60b71e27257d65fb463 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 24 一月 2022 10:21:54 +0800
Subject: [PATCH] Merge branch 'sxjzasrs' of http://47.97.1.152:5880/r/zy-asrs into sxjzasrs0
---
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
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 ff87134..b0d7609 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.MatCodeCountDto;
@@ -38,8 +39,11 @@
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.setWrkNo(workNo);
wrkDetl.setIoTime(new Date());
- wrkDetl.setAnfme(dto.getCount()); // 鏁伴噺
+ wrkDetl.setQty(dto.getCount()); // 鏁伴噺
VersionUtils.setWrkDetl(wrkDetl, matCode); // 鐗堟湰鎺у埗
+ wrkDetl.setBillNo((null != dto.getBillNo()) ? dto.getBillNo() : "0");
+ wrkDetl.setSeqNo((null != dto.getSeqNo()) ? dto.getSeqNo() : 0);
+ wrkDetl.setSupplier(dto.getSupplier());
wrkDetl.setZpallet(barcode); // 鎵樼洏鏉＄爜
wrkDetl.setAppeUser(userId);
wrkDetl.setAppeTime(new Date());
@@ -53,7 +57,15 @@
@Override
@Transactional
- public List<WrkDetl> queryWrkDetl(String matnr, String locNo) {
- return baseMapper.queryWrkDetl(matnr, locNo);
+ public List<WrkDetl> queryWrkDetl(String matNo, String locNo) {
+ return baseMapper.queryWrkDetl(matNo, locNo);
+ }
+
+ /**
+ * PDA鐩樼偣鏍规嵁鍑哄簱鍙ｆ煡璇㈠搴旂墿鏂欎俊鎭�
+ */
+ @Override
+ public List<WrkDetl> queryMatFromDevNo(Integer devNo) {
+ return baseMapper.queryMatFromDevNo(devNo);
}
}
--
Gitblit v1.9.1