24282 1 год назад
Родитель
Сommit
c2b32b5bbf

+ 2 - 2
sd-business/src/main/java/com/sd/business/service/bom/impl/BomSpecServiceImpl.java

@@ -51,8 +51,8 @@ public class BomSpecServiceImpl extends ServiceImpl<BomSpecMapper, BomSpec> impl
                 .selectAs(BomClassify::getName, BomSpecBo::getClassifyName)
 
                 .from(BomSpec.class)
-                .leftJoin(Bom.class, Bom::getId, BomSpec::getBomId)
-                .leftJoin(BomClassify.class, BomClassify::getId, Bom::getBomClassifyId);
+                .leftJoin(Bom.class, BomSpec::getBomId)
+                .leftJoin(BomClassify.class, Bom::getBomClassifyId);
     }
 
 }

+ 5 - 5
sd-business/src/main/java/com/sd/business/service/in/impl/InOutStorageBomServiceImpl.java

@@ -50,11 +50,11 @@ public class InOutStorageBomServiceImpl extends ServiceImpl<InOutStorageBomMappe
                 .selectAs(Purchase::getCode, InOutStorageBomVo::getPurchaseCode)
 
                 .from(InOutStorageBom.class)
-                .leftJoin(InOutStorage.class, InOutStorage::getId, InOutStorageBom::getInOutStorageId)
-                .leftJoin(BomSpec.class, BomSpec::getId, InOutStorageBom::getBomSpecId)
-                .leftJoin(Warehouse.class, Warehouse::getId, InOutStorage::getWarehouseId)
-                .leftJoin(Department.class, Department::getId, InOutStorage::getDepartmentId)
-                .leftJoin(Purchase.class, Purchase::getId, InOutStorage::getPurchaseId)
+                .leftJoin(InOutStorage.class, InOutStorageBom::getInOutStorageId)
+                .leftJoin(BomSpec.class, InOutStorageBom::getBomSpecId)
+                .leftJoin(Warehouse.class, InOutStorage::getWarehouseId)
+                .leftJoin(Department.class, InOutStorage::getDepartmentId)
+                .leftJoin(Purchase.class, InOutStorage::getPurchaseId)
 
                 .orderByDesc(InOutStorageBom::getId)
                 .like(InOutStorage::getCode, dto.getCode())

+ 4 - 4
sd-business/src/main/java/com/sd/business/service/inventory/impl/InventoryBackupServiceImpl.java

@@ -50,10 +50,10 @@ public class InventoryBackupServiceImpl extends ServiceImpl<InventoryBackupMappe
                 .add(Inventory::getQuantity, Inventory::getLockQuantity, InventoryBackupVo::getTotalQuantity)
 
                 .from(Inventory.class)
-                .leftJoin(BomSpec.class, BomSpec::getId, Inventory::getBomSpecId)
-                .leftJoin(Bom.class, Bom::getId, BomSpec::getBomId)
-                .leftJoin(Warehouse.class, Warehouse::getId, Inventory::getWarehouseId)
-                .leftJoin(Department.class, Department::getId, Inventory::getDepartmentId)
+                .leftJoin(BomSpec.class, Inventory::getBomSpecId)
+                .leftJoin(Bom.class, BomSpec::getBomId)
+                .leftJoin(Warehouse.class, Inventory::getWarehouseId)
+                .leftJoin(Department.class, Inventory::getDepartmentId)
 
                 .orderByDesc(Inventory::getId)
                 .eq(InventoryBackup::getBackupDate, DateUtil.offsetDay(dto.getBackupDate(), -1))

+ 4 - 5
sd-business/src/main/java/com/sd/business/service/inventory/impl/InventoryFinishedOrderServiceImpl.java

@@ -3,7 +3,6 @@ package com.sd.business.service.inventory.impl;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.constant.StatusConstant;
-import com.ruoyi.common.core.domain.BaseIdPo;
 import com.sd.business.entity.department.constant.DepartmentConstant;
 import com.sd.business.entity.department.po.Department;
 import com.sd.business.entity.inventory.dto.InventoryFinishedOrderDto;
@@ -56,9 +55,9 @@ public class InventoryFinishedOrderServiceImpl extends ServiceImpl<InventoryFini
                 .selectAs(Department::getName, InventoryFinishedOrderVo::getDepartmentName)
 
                 .from(InventoryFinishedOrderDetail.class)
-                .leftJoin(SkuSpec.class, SkuSpec::getId, InventoryFinishedOrderDetail::getSkuSpecId)
-                .leftJoin(OrderInfo.class, BaseIdPo::getId, InventoryFinishedOrderDetail::getOrderInfoId)
-                .leftJoin(Department.class, Department::getId, OrderInfo::getDepartmentId)
+                .leftJoin(SkuSpec.class, InventoryFinishedOrderDetail::getSkuSpecId)
+                .leftJoin(OrderInfo.class, InventoryFinishedOrderDetail::getOrderInfoId)
+                .leftJoin(Department.class, OrderInfo::getDepartmentId)
 
                 .orderByDesc(InventoryFinishedOrderDetail::getId)
                 .like(InventoryFinishedOrderDetail::getCode, dto.getCode())
@@ -69,7 +68,7 @@ public class InventoryFinishedOrderServiceImpl extends ServiceImpl<InventoryFini
                 .like(OrderInfo::getCode, dto.getOrderCode())
                 .like(OrderInfo::getWlnCode, dto.getOrderWlnCode())
 
-                .eq("d", Department::getId, dto.getDepartmentId())
+                .eq(Department::getId, dto.getDepartmentId())
                 .page(dto);
 
         return page;

+ 4 - 4
sd-business/src/main/java/com/sd/business/service/inventory/impl/InventoryServiceImpl.java

@@ -83,10 +83,10 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
                 .add(Inventory::getQuantity, Inventory::getLockQuantity, InventoryVo::getTotalQuantity)
 
                 .from(Inventory.class)
-                .leftJoin(BomSpec.class, BomSpec::getId, Inventory::getBomSpecId)
-                .leftJoin(Bom.class, Bom::getId, BomSpec::getBomId)
-                .leftJoin(Warehouse.class, Warehouse::getId, Inventory::getWarehouseId)
-                .leftJoin(Department.class, Department::getId, Inventory::getDepartmentId)
+                .leftJoin(BomSpec.class, Inventory::getBomSpecId)
+                .leftJoin(Bom.class, BomSpec::getBomId)
+                .leftJoin(Warehouse.class, Inventory::getWarehouseId)
+                .leftJoin(Department.class, Inventory::getDepartmentId)
 
                 .eq(Inventory::getDepartmentId, dto.getDepartmentId())
                 .eq(Inventory::getWarehouseId, dto.getWarehouseId())

+ 3 - 3
sd-business/src/main/java/com/sd/business/service/sku/impl/SkuServiceImpl.java

@@ -112,8 +112,8 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements SkuSe
                 .selectAs(BomSpec::getName, SkuSpecVo::getBomSpecName)
 
                 .from(SkuSpec.class)
-                .leftJoin(ArtworkLibrary.class, ArtworkLibrary::getId, SkuSpec::getArtworkLibraryId)
-                .leftJoin(BomSpec.class, BaseIdPo::getId, SkuSpec::getBomSpecId)
+                .leftJoin(ArtworkLibrary.class, SkuSpec::getArtworkLibraryId)
+                .leftJoin(BomSpec.class, SkuSpec::getBomSpecId)
 
                 .eq(SkuSpec::getSkuId, id)
                 .list();
@@ -126,7 +126,7 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements SkuSe
                 .selectAs(BomSpec::getName, SkuSpecLinkVo::getBomSpecName)
 
                 .from(SkuSpecLink.class)
-                .leftJoin(BomSpec.class, BomSpec::getId, SkuSpecLink::getBomSpecId)
+                .leftJoin(BomSpec.class, SkuSpecLink::getBomSpecId)
 
                 .eq(SkuSpecLink::getSkuId, id)
                 .list()