From ffbddedac17c4a7d18d382c4917b3f375356e061 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期二, 01 四月 2025 10:23:47 +0800
Subject: [PATCH] 整体流程测试修改0401-1
---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceLeasingLedgerServiceImpl.java | 52 +++++++++++++---------------------------------------
1 files changed, 13 insertions(+), 39 deletions(-)
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceLeasingLedgerServiceImpl.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceLeasingLedgerServiceImpl.java
index e3862fa..e468074 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceLeasingLedgerServiceImpl.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceLeasingLedgerServiceImpl.java
@@ -71,16 +71,10 @@
if (contractItem.getNum()<item.getNum()) {
return R.failed("鍚堝悓涓�"+item.getDeviceName()+"璁惧鏁伴噺涓庡彴璐︽槑缁嗕腑涓嶄竴鑷达紝鏃犳硶寤虹珛鍙拌处");
}
+ Integer deviceNum = itemMapper.selectDeviceNumByContractId(contract.getId(),contractItem.getDeviceId());
//鏌ヨ鏄惁鏈夊巻鍙插嚭璐�
- QueryWrapper<DeviceLeasingLedgerItem> queryWrapperLedgerItem = new QueryWrapper<>();
- queryWrapperLedgerItem.eq("contract_id",contract.getId());
- queryWrapperLedgerItem.eq("device_id",contractItem.getDeviceId());
- List<DeviceLeasingLedgerItem> noteItemList = itemMapper.selectList(queryWrapperLedgerItem);
- if (noteItemList != null&¬eItemList.size()>0) {
- Integer deviceNum = noteItemList.stream().mapToInt(DeviceLeasingLedgerItem::getNum).sum();
- if (contractItem.getNum()<(item.getNum()+deviceNum)) {
- return R.failed("鍚堝悓涓�"+item.getDeviceName()+"璁惧鏁伴噺鍑虹鍙拌处宸茶秴鍑鸿澶囧簱瀛橈紝鏃犳硶寤虹珛鍙拌处");
- }
+ if (contractItem.getNum()<(item.getNum()+deviceNum)) {
+ return R.failed("鍚堝悓涓�"+item.getDeviceName()+"璁惧鏁伴噺鍑虹鍙拌处宸茶秴鍑鸿澶囧疄闄呭簱瀛橈紝鏃犳硶寤虹珛鍙拌处");
}
}
}
@@ -95,27 +89,15 @@
for (String serialNo:item.getSerialNos()
) {
Device device = deviceMapper.selectById(item.getDeviceId());
- if (device!=null) {
- DeviceInventory inventory = new DeviceInventory();
- inventory.setDeviceId(item.getDeviceId());
- inventory.setDeviceNumber(item.getDeviceCode());
- inventory.setName(device.getName());
- inventory.setSerialNo(serialNo);
- //鏍规嵁鍚堝悓绫诲瀷 璐拱 鎵跨 鍚堝悓绫诲瀷涓哄叆搴撴搷浣�
- if (contract!=null&&(contract.getType()==1||contract.getType()==2)){
- inventory.setSource(1);
- //鍏ュ簱鎿嶄綔 搴撳瓨鐘舵�佷负 鍙敤
- inventory.setInventoryStatus(1);
- }
- //鏍规嵁鍚堝悓绫诲瀷 绉熻祦 鍚堝悓绫诲瀷涓哄嚭搴撴搷浣�
- if (contract!=null&&contract.getType()==0){
- inventory.setSource(0);
- //鍑哄簱鎿嶄綔 搴撳瓨鐘舵�佷负 绉熻祦涓�
- inventory.setInventoryStatus(2);
- }
+ QueryWrapper<DeviceInventory> inventoryQueryWrapper = new QueryWrapper<>();
+ inventoryQueryWrapper.eq("device_id",item.getDeviceId());
+ inventoryQueryWrapper.eq("serial_no",serialNo);
+ DeviceInventory inventory = inventoryMapper.selectOne(inventoryQueryWrapper);
+ if (device!=null&&inventory!=null) {
+ inventory.setInventoryStatus(2);
inventory.setLedgerItemId(item.getId());
//搴撳瓨璋冩暣
- inventoryMapper.insert(inventory);
+ inventoryMapper.updateById(inventory);
//璁惧搴撳瓨娴佹按鍚屾鏂板
InventoryFlowWater flowWater = new InventoryFlowWater();
@@ -139,17 +121,9 @@
//鍚堝悓鏄庣粏涓笌鍙拌处瀵规瘮
for (ContractItem contractItem:list
) {
- //鏌ヨ瀹為檯鍙拌处鎯呭喌
- QueryWrapper<DeviceLeasingLedgerItem> queryWrapperLedgerItem = new QueryWrapper<>();
- queryWrapperLedgerItem.eq("contract_id",contract.getId());
- queryWrapperLedgerItem.eq("device_id",contractItem.getDeviceId());
- List<DeviceLeasingLedgerItem> ledgerItemList = itemMapper.selectList(queryWrapperLedgerItem);
- if (ledgerItemList != null&&ledgerItemList.size()>0) {
- Integer deviceNum = ledgerItemList.stream().mapToInt(DeviceLeasingLedgerItem::getNum).sum();
- if (contractItem.getNum()!=deviceNum) {
- return R.ok();
- }
- }else {
+ Integer deviceNum = itemMapper.selectDeviceNumByContractId(contract.getId(),contractItem.getDeviceId());
+ //鏌ヨ鏄惁鏈夊巻鍙插嚭璐�
+ if (contractItem.getNum()!=deviceNum) {
return R.ok();
}
}
--
Gitblit v1.9.1