From c8a37bd3531a1b65592534f7edcc1f3e0dea8613 Mon Sep 17 00:00:00 2001 From: xia Date: Fri, 16 Sep 2022 11:33:23 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=9B=B4=E6=96=B0=E7=9B=98=E7=82=B9=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../archives/repository/ArchivesCheckBillDataRepository.java | 5 +++-- .../archives/service/impl/ArchivesCaseServiceImpl.java | 4 ++-- .../modules/archives/service/impl/ArrangeServiceImpl.java | 4 +++- system/src/main/resources/application.yml | 4 ++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/archives/src/main/java/com/storeroom/modules/archives/repository/ArchivesCheckBillDataRepository.java b/archives/src/main/java/com/storeroom/modules/archives/repository/ArchivesCheckBillDataRepository.java index 33a7855..a823d3f 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/repository/ArchivesCheckBillDataRepository.java +++ b/archives/src/main/java/com/storeroom/modules/archives/repository/ArchivesCheckBillDataRepository.java @@ -12,10 +12,11 @@ import java.util.List; public interface ArchivesCheckBillDataRepository extends JpaRepository{ @Query(nativeQuery = true , - value = "select DISTINCT t1.archives_id,t1.id,t1.bill_id,t1.shelf_id,t1.check_result,t1.rfid,t1.create_time " + + value = "select DISTINCT t1.archives_id,t1.id,t1.bill_id,t1.shelf_id,t1.check_result,t1.rfid,max(t1.create_time) as create_time " + "from archives_check_bill_data t1 inner join (select archives_id,max(create_time) as create_time from " + "archives_check_bill_data where bill_id = ?1 group by archives_id) t2 " + - "on t1.archives_id = t2.archives_id where t1.create_time = t2.create_time and bill_id =?1 order by t1.create_time desc ") + "on t1.archives_id = t2.archives_id where t1.create_time = t2.create_time and bill_id =?1 " + + "group by t1.archives_id order by t1.create_time desc ") List findByOrderId(String orderId); @Modifying diff --git a/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesCaseServiceImpl.java b/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesCaseServiceImpl.java index c192471..4edbeb4 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesCaseServiceImpl.java +++ b/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesCaseServiceImpl.java @@ -611,11 +611,11 @@ public class ArchivesCaseServiceImpl implements ArchivesCaseService { } cases = caseRepository.saveAllAndFlush(cases); archivesSummaryRepository.saveAllAndFlush(archices); - List storageLogs = new ArrayList<>(); +// List storageLogs = new ArrayList<>(); for (ArchivesCase archivesCase:cases){ this.recordStorage(archivesCase,2); } - storageLogRepository.saveAll(storageLogs); +// storageLogRepository.saveAll(storageLogs); return cases; } diff --git a/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArrangeServiceImpl.java b/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArrangeServiceImpl.java index 0265e1e..c0e868a 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArrangeServiceImpl.java +++ b/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArrangeServiceImpl.java @@ -119,7 +119,7 @@ public class ArrangeServiceImpl implements ArrangeService { @Override public Object initArrangeList(Integer checkState, String region, String orderNo, Pageable page) { - checkState = checkState == -1 ? null : checkState; +// checkState = checkState == -1 ? null : checkState; orderNo = StringUtils.isEmpty(orderNo) ? null : "%"+ orderNo +"%"; region = StringUtils.isEmpty(region) ? null : "%"+ region +"%"; return PageUtil.toPage(archivesCheckBillRepository.initArrangeList(checkState,region,orderNo,page)); @@ -154,11 +154,13 @@ public class ArrangeServiceImpl implements ArrangeService { } @Override + @Transactional public Object addArrangeData(List datas) { return archivesCheckBillDataRepository.saveAll(datas); } @Override + @Transactional public Object settlement(String orderNo) { Integer correct = 0;//在库 Integer checked = 0;//已盘 diff --git a/system/src/main/resources/application.yml b/system/src/main/resources/application.yml index 6eca246..447c2dc 100644 --- a/system/src/main/resources/application.yml +++ b/system/src/main/resources/application.yml @@ -77,8 +77,8 @@ user-cache: min-idle-time: 3600000 # 手持机参数 -hand-held: - ip: 127.0.0.1:8057 +#hand-held: +# ip: 127.0.0.1:8057 webSocket: netty: