From cd48455bd44a1935a81f8e78c727b858fae271db Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期一, 07 四月 2025 11:41:57 +0800
Subject: [PATCH] 招标新增审核状态 待审核
---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceLeasingLedgerServiceImpl.java | 46 ++++++++++++++++++++++++----------------------
1 files changed, 24 insertions(+), 22 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 34f149f..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
@@ -68,8 +68,13 @@
for (DeviceLeasingLedgerItem item:deviceLeasingLedger.getLedgerItemList()
) {
if (contractItem.getDeviceId().equals(item.getDeviceId())){
- if (contractItem.getNum()!=item.getNum()) {
- return R.failed("鍚堝悓涓�"+item.getDeviceName()+"璁惧鏁伴噺涓庡彴璐︽槑缁嗕腑涓嶄竴鑷�");
+ if (contractItem.getNum()<item.getNum()) {
+ return R.failed("鍚堝悓涓�"+item.getDeviceName()+"璁惧鏁伴噺涓庡彴璐︽槑缁嗕腑涓嶄竴鑷达紝鏃犳硶寤虹珛鍙拌处");
+ }
+ Integer deviceNum = itemMapper.selectDeviceNumByContractId(contract.getId(),contractItem.getDeviceId());
+ //鏌ヨ鏄惁鏈夊巻鍙插嚭璐�
+ if (contractItem.getNum()<(item.getNum()+deviceNum)) {
+ return R.failed("鍚堝悓涓�"+item.getDeviceName()+"璁惧鏁伴噺鍑虹鍙拌处宸茶秴鍑鸿澶囧疄闄呭簱瀛橈紝鏃犳硶寤虹珛鍙拌处");
}
}
}
@@ -84,26 +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();
@@ -124,7 +118,15 @@
}
}
}
-
+ //鍚堝悓鏄庣粏涓笌鍙拌处瀵规瘮
+ for (ContractItem contractItem:list
+ ) {
+ Integer deviceNum = itemMapper.selectDeviceNumByContractId(contract.getId(),contractItem.getDeviceId());
+ //鏌ヨ鏄惁鏈夊巻鍙插嚭璐�
+ if (contractItem.getNum()!=deviceNum) {
+ return R.ok();
+ }
+ }
//鏇存柊鍚堝悓鐘舵�佷负瀹屾垚
contract.setStatus(2);
contractMapper.updateById(contract);
--
Gitblit v1.9.1