diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/WmsMaterialTransferRecord.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/WmsMaterialTransferRecord.java index 0ea20df9..6cb654ce 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/WmsMaterialTransferRecord.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/WmsMaterialTransferRecord.java @@ -56,12 +56,14 @@ public class WmsMaterialTransferRecord extends TenantEntity { * 调入仓库 */ private Long transferInStoreId; - + /** + * 调拨单ID + */ + private Long transferBillsId; /** * 库存id */ private Long inventoryDetailsId; - /** * 删除标志（0代表存在 1代表删除） */ @@ -72,7 +74,6 @@ public class WmsMaterialTransferRecord extends TenantEntity { */ @TableField(exist = false) private String productCode; - /** * 成品名称 */ @@ -81,9 +82,10 @@ public class WmsMaterialTransferRecord extends TenantEntity { @TableField(exist = false) private String externalBrand; @TableField(exist = false) - /** - * 成品描述 - */ private String productSpe; - private Long transferBillsId; + + @TableField(exist = false) + private Double unitPrice; + @TableField(exist = false) + private Long projectId; } diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsInventoryDetailsServiceImpl.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsInventoryDetailsServiceImpl.java index 4adb564d..db200d0e 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsInventoryDetailsServiceImpl.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsInventoryDetailsServiceImpl.java @@ -234,7 +234,7 @@ public class WmsInventoryDetailsServiceImpl implements IWmsInventoryDetailsServi public WmsInventoryDetails queryInventory(WmsInventoryDetailsBo bo) { MPJLambdaWrapper lqw = JoinWrappers.lambda(WmsInventoryDetails.class) .selectAll(WmsInventoryDetails.class) - .eq(WmsInventoryDetails::getDelFlag, "0") + // .eq(WmsInventoryDetails::getDelFlag, "0") .eq(StringUtils.isNotBlank(bo.getLocationCode()), WmsInventoryDetails::getLocationCode, bo.getLocationCode()) .eq(bo.getWarehouseId() != null, WmsInventoryDetails::getWarehouseId, bo.getWarehouseId()) .eq(bo.getMaterielId() != null, WmsInventoryDetails::getMaterielId, bo.getMaterielId()) diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsMaterialTransferBillsServiceImpl.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsMaterialTransferBillsServiceImpl.java index 7a84aa7a..02b9d86b 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsMaterialTransferBillsServiceImpl.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsMaterialTransferBillsServiceImpl.java @@ -103,6 +103,7 @@ public class WmsMaterialTransferBillsServiceImpl implements IWmsMaterialTransfer if (flag) { Long transferBillsId = add.getTransferBillsId(); bo.setTransferBillsId(transferBillsId); + //插入子表 wmsMaterialTransferRecordService.insertByBo(transferBillsId,bo.getList()); diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsMaterialTransferRecordServiceImpl.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsMaterialTransferRecordServiceImpl.java index 1cbd60f4..a6bbd657 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsMaterialTransferRecordServiceImpl.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsMaterialTransferRecordServiceImpl.java @@ -9,12 +9,11 @@ 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.wms.domain.WmsBaseProduct; -import org.dromara.wms.domain.WmsInventoryDetails; import org.dromara.wms.domain.WmsMaterialTransferRecord; import org.dromara.wms.domain.bo.WmsMaterialTransferRecordBo; import org.dromara.wms.domain.vo.WmsMaterialTransferRecordVo; -import org.dromara.wms.mapper.WmsInventoryDetailsMapper; import org.dromara.wms.mapper.WmsMaterialTransferRecordMapper; +import org.dromara.wms.service.IWmsInventoryDetailsService; import org.dromara.wms.service.IWmsMaterialTransferRecordService; import org.springframework.stereotype.Service; @@ -34,7 +33,8 @@ public class WmsMaterialTransferRecordServiceImpl implements IWmsMaterialTransfe private final WmsMaterialTransferRecordMapper baseMapper; - private final WmsInventoryDetailsMapper wmsInventoryDetailsMapper; + // private final WmsInventoryDetailsMapper wmsInventoryDetailsMapper; + private final IWmsInventoryDetailsService wmsInventoryDetailsService; /** * 查询物料调拨 @@ -98,13 +98,28 @@ public class WmsMaterialTransferRecordServiceImpl implements IWmsMaterialTransfe */ @Override public Boolean insertByBo(Long transferBillsId, List bo) { - baseMapper.insert(bo); + // 修改库存 bo.forEach(record -> { record.setTransferBillsId(transferBillsId);// 调拨单ID - Long inventoryDetailsId = record.getInventoryDetailsId(); // 库存ID + Long inventoryId = record.getInventoryDetailsId(); // 库存ID Double transferQty = record.getTransferQty(); // 调拨数量 - // 库存验证 + wmsInventoryDetailsService.outStoreLossInventoryAmount( + inventoryId, + transferQty, + record.getTransferOutStoreId(), + record.getBatchNumber(), + record.getMaterielId(), "6"); + wmsInventoryDetailsService.inStoreAddInventoryAmount( + record.getTransferInStoreId(), + record.getProjectId(), + record.getBatchNumber(), + record.getMaterielId(), + record.getUnitPrice(), + record.getUnitName(), + transferQty, "7"); + + /* // 库存验证 WmsInventoryDetails inventoryDetails = wmsInventoryDetailsMapper.selectById(inventoryDetailsId); double lossQty = inventoryDetails.getInventoryAmount() - transferQty; if (lossQty < 0) { @@ -117,7 +132,9 @@ public class WmsMaterialTransferRecordServiceImpl implements IWmsMaterialTransfe if (lossQty == 0) { outDetails.setDelFlag("1"); } - wmsInventoryDetailsMapper.updateById(outDetails); + // wmsInventoryDetailsMapper.updateById(outDetails); + + // 入库库存增加 WmsInventoryDetails inDetails = new WmsInventoryDetails(); inDetails.setInventoryAmount(transferQty);// 入库数量 @@ -125,11 +142,11 @@ public class WmsMaterialTransferRecordServiceImpl implements IWmsMaterialTransfe inDetails.setMaterielId(inventoryDetails.getMaterielId()); inDetails.setUnitPrice(inventoryDetails.getUnitPrice()); inDetails.setBatchNumber(record.getBatchNumber()); - inDetails.setUnitName(record.getUnitName()); + inDetails.setUnitName(record.getUnitName());*/ // inDetails - wmsInventoryDetailsMapper.insert(inDetails); + // wmsInventoryDetailsMapper.insert(inDetails); }); - + baseMapper.insert(bo); return true; } diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsSampleLedgerServiceImpl.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsSampleLedgerServiceImpl.java index f4634797..f187261c 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsSampleLedgerServiceImpl.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsSampleLedgerServiceImpl.java @@ -35,7 +35,6 @@ public class WmsSampleLedgerServiceImpl implements IWmsSampleLedgerService { private final WmsSampleLedgerMapper baseMapper; private final IWmsInventoryDetailsService inventoryDetailsService; - private final WmsInventoryLedgerMapper wmsInventoryLedgerMapper; /** * 查询样品管理 @@ -104,24 +103,10 @@ public class WmsSampleLedgerServiceImpl implements IWmsSampleLedgerService { */ @Override public Boolean insertByBo(List bo) { - List wmsInventoryLedgers = new ArrayList<>(bo.size()); bo.forEach(item -> { - Long inventoryId = item.getInventoryDetailsId(); - Double lentQty = item.getLentQty(); - Double inventoryAmount = inventoryDetailsService.workUpdateInventory(inventoryId, lentQty); - //库存变动 - WmsInventoryLedger wmsInventoryLedger = new WmsInventoryLedger(); - wmsInventoryLedger.setWarehouseId(item.getWarehouseId()); - wmsInventoryLedger.setBatchNumber(item.getBatchNumber()); - wmsInventoryLedger.setMaterielId(item.getMaterielId()); - wmsInventoryLedger.setChangeType("4");//变动类型 - wmsInventoryLedger.setLedgerState("0"); - wmsInventoryLedger.setChangeAmount(lentQty); - wmsInventoryLedger.setInventoryAmount(inventoryAmount); - wmsInventoryLedgers.add(wmsInventoryLedger); + inventoryDetailsService.outStoreLossInventoryAmount(item.getInventoryDetailsId(), + item.getLentQty(),item.getWarehouseId(),item.getBatchNumber(),item.getMaterielId(),"4"); }); - - wmsInventoryLedgerMapper.insert(wmsInventoryLedgers); baseMapper.insert(bo); return true; }