廖井涛
2024-11-12 c0b9912decb484d93242e96aa4d6ecf7d277ccb4
物料库存修改
3个文件已修改
41 ■■■■■ 已修改文件
north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
@@ -327,6 +327,15 @@
                materialOutboundId = object.get("materialOutboundId").toString();
            }
            if(materialOutboundId!=null){
                List<MaterialOutboundDetail> materialOutboundDetailLists = materialInventoryMapper.getIsNotMaterialOutboundDetail(materialOutboundId);
                if (!materialOutboundDetailLists.isEmpty()) {
                    for (MaterialOutboundDetail materialOutboundDetail : materialOutboundDetailLists) {
                        //还原物料库存数
                        materialInventoryMapper.updateMaterialInventoryAvailableInt(materialOutboundDetail.getInventoryId(), materialOutboundDetail.getOutboundQuantity());
                    }
                }
                materialInventoryMapper.deleteMaterialOutboundDetail(materialOutboundId);
                materialInventoryMapper.deleteMaterialOutbound(materialOutboundId);
                materialInventoryMapper.deleteMaterialLog(materialOutboundId);
@@ -363,6 +372,15 @@
                returningId = object.get("returningId").toString();
            }
            if(returningId!=null){
                List<ReturningWarehouseDetail> returningWarehouseDetailLists = materialInventoryMapper.getIsNotReturningWarehouseDetail(returningId);
                if (!returningWarehouseDetailLists.isEmpty()) {
                    for (ReturningWarehouseDetail returningWarehouseDetail : returningWarehouseDetailLists) {
                        //还原物料库存数
                        materialInventoryMapper.updateMaterialInventoryAvailableOut(returningWarehouseDetail.getInventoryId(), returningWarehouseDetail.getReturnQuantity());
                    }
                }
                materialInventoryMapper.deleteReturningWarehouseDetail(returningId);
                materialInventoryMapper.deleteReturningWarehouse(returningId);
                materialInventoryMapper.deleteMaterialLog(returningId);
north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
@@ -562,11 +562,23 @@
    </delete>
    <select id="getMaximum" >
        select count(*) from mm.material_outbound where  date(create_time)=CURDATE()
        select
            ifnull(SUBSTR(max(right(material_outbound_id,8)) from 7),0)
        from
            mm.material_outbound as a
        where
            date(a.create_time) = curdate()
    </select>
    <select id="getMaximums" >
        select count(*) from mm.returning_warehouse where  date(create_time)=CURDATE()
        select
            ifnull(SUBSTR(max(right(returning_id,8)) from 7),0)
        from
            mm.returning_warehouse as a
        where
            date(a.create_time) = curdate()
    </select>
    <select id="getMaterialOutboundCount" >
north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
@@ -42,7 +42,12 @@
    <select id="getmaximum" >
        select count(*) from sd.delivery where  date(create_time)=CURDATE()
        select
            ifnull(SUBSTR(max(right(delivery_id,8)) from 7),0)
        from
            sd.delivery as a
        where
            date(a.create_time) = curdate()
    </select>
    <select id="getmaximumMonth">