From 2f932f2675b0e7cfa7c5466b058d93aec67d6f3c Mon Sep 17 00:00:00 2001
From: whycq <you@example.com>
Date: 星期一, 30 一月 2023 22:10:44 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index ea1afea..b9b9617 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -67,6 +67,8 @@
     private AdjDetlService adjDetlService;
     @Autowired
     private CheckRecordService checkRecordService;
+    @Autowired
+    private LocDetlService locDetlService;
 
     @Override
     @Transactional
@@ -98,6 +100,12 @@
             List<DetlDto> detlDtos = new ArrayList<>();
             param.getCombMats().forEach(elem -> {
                 DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getMemo());
+
+                if (Cools.isEmpty(detlDto.getBatch())){
+                    String batch = DateUtils.convert(new Date(),DateUtils.yyyyMMdd);
+                    detlDto.setBatch(batch);
+                }
+
                 if (DetlDto.has(detlDtos, detlDto)) {
                     DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
                     assert one != null;
@@ -212,8 +220,14 @@
             WrkDetl wrkDetlOld = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>()
                     .eq("wrk_no", wrkMast.getWrkNo())
                     .eq("matnr",wrkDetl.getMatnr())
-                    .eq("batch",wrkDetl.getBatch())
+//                    .eq("batch",Cools.isEmpty(wrkDetl.getBatch())?"":wrkDetl.getBatch())
             );
+//            LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>()
+//                            .eq("loc_no", wrkMast.getLocNo())
+//                            .eq("matnr",wrkDetl.getMatnr())
+//                            .eq("batch",wrkDetl.getBatch())
+//            );
+
             adjDetl.setMatnr(wrkDetl.getMatnr());
             adjDetl.setBatch(wrkDetl.getBatch());
             adjDetl.setAdjQty(wrkDetl.getAnfme());

--
Gitblit v1.9.1