1.更新盘点功能

archives/src/main/java/com/storeroom/modules/archives/repository/ArchivesCheckBillDataRepository.java

@@ -12,10 +12,11 @@ import java.util.List;
 public interface ArchivesCheckBillDataRepository extends JpaRepository<ArchivesCheckBillData, String>{
 
     @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<ArchivesCheckBillData> findByOrderId(String orderId);
 
     @Modifying

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<StorageLog> storageLogs = new ArrayList<>();
+//        List<StorageLog> storageLogs = new ArrayList<>();
         for (ArchivesCase archivesCase:cases){
             this.recordStorage(archivesCase,2);
         }
-        storageLogRepository.saveAll(storageLogs);
+//        storageLogRepository.saveAll(storageLogs);
         return cases;
     }
 

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<ArchivesCheckBillData> datas) {
         return archivesCheckBillDataRepository.saveAll(datas);
     }
 
     @Override
+    @Transactional
     public Object settlement(String orderNo) {
         Integer correct = 0;//在库
         Integer checked = 0;//已盘

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: