diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/bo/WmsInventoryDetailsBo.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/bo/WmsInventoryDetailsBo.java index d8236af1..826607cd 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/bo/WmsInventoryDetailsBo.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/bo/WmsInventoryDetailsBo.java @@ -82,4 +82,5 @@ public class WmsInventoryDetailsBo extends BaseEntity { * 物料单位 */ private String unitName; + private String delFlag; } diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsInventoryDetailsMapper.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsInventoryDetailsMapper.java index 21398ffa..de2cb343 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsInventoryDetailsMapper.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsInventoryDetailsMapper.java @@ -20,4 +20,6 @@ import org.springframework.stereotype.Repository; @Repository public interface WmsInventoryDetailsMapper extends BaseMapperPlus { + int updataDetailsByInventoryId(WmsInventoryDetails inventoryDetails); + } diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsOutStockBillServiceImpl.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsOutStockBillServiceImpl.java index 7c247058..7ad63f50 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsOutStockBillServiceImpl.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsOutStockBillServiceImpl.java @@ -5,24 +5,29 @@ import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboReference; +import org.dromara.common.core.utils.DateUtils; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.system.api.RemoteCodeRuleService; import org.dromara.wms.domain.WmsInventoryDetails; +import org.dromara.wms.domain.WmsInventoryLedger; import org.dromara.wms.domain.WmsOutStockBill; import org.dromara.wms.domain.WmsOutStockDetails; import org.dromara.wms.domain.bo.WmsOutStockBillBo; -import org.dromara.wms.domain.vo.WmsInventoryDetailsVo; import org.dromara.wms.domain.vo.WmsOutStockBillVo; import org.dromara.wms.mapper.WmsInventoryDetailsMapper; +import org.dromara.wms.mapper.WmsInventoryLedgerMapper; import org.dromara.wms.mapper.WmsOutStockBillMapper; import org.dromara.wms.mapper.WmsOutStockDetailsMapper; import org.dromara.wms.service.IWmsOutStockBillService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Map; @@ -39,9 +44,10 @@ public class WmsOutStockBillServiceImpl implements IWmsOutStockBillService { private final WmsOutStockBillMapper baseMapper; private final WmsOutStockDetailsMapper wmsOutStockDetailsMapper; + private final WmsInventoryDetailsMapper wmsInventoryDetailsMapper; + private final WmsInventoryLedgerMapper wmsInventoryLedgerMapper; @DubboReference private RemoteCodeRuleService remoteCodeRuleService; - private final WmsInventoryDetailsMapper wmsInventoryDetailsMapper; /** * 查询出库单 @@ -112,19 +118,40 @@ public class WmsOutStockBillServiceImpl implements IWmsOutStockBillService { if (flag) { Long outStockBillId = add.getOutStockBillId(); List outStockDetailsList = bo.getOutStockDetailsList(); + List wmsInventoryLedgers = new ArrayList<>(); outStockDetailsList.forEach(item -> { - item.setOutStockBillId(outStockBillId); // 从出库明细中获取库存ID Long inventoryId = item.getInventoryDetailsId(); WmsInventoryDetails inventory = wmsInventoryDetailsMapper.selectById(inventoryId); - if (inventory.getInventoryAmount() - + + + update wms_inventory_details + + inventory_amount = #{inventoryAmount}, + del_flag = #{delFlag}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where inventory_details_id = #{inventoryDetailsId} +