lot编号传递;

This commit is contained in:
王奎兴
2026-04-18 15:57:55 +08:00
parent 8898a4e798
commit 584ff7ba21
3 changed files with 10 additions and 5 deletions
@@ -271,6 +271,7 @@ public class DifferentManageImpl extends ServiceImpl<DifferentManageMapper, Diff
stockInOrder.setDocumentCreatorName(userPo.getUserName()); stockInOrder.setDocumentCreatorName(userPo.getUserName());
stockInOrder.setDocumentDate(new Date()); stockInOrder.setDocumentDate(new Date());
stockInOrder.setNeedCustomsDeclaration(0); stockInOrder.setNeedCustomsDeclaration(0);
stockInOrder.setQuantity(investigetionManageDetail.getDifferentQuantity());
@@ -287,7 +288,7 @@ public class DifferentManageImpl extends ServiceImpl<DifferentManageMapper, Diff
inMaterialDetail.setInOrderNumber(stockInOrder.getInOrderNumber()); inMaterialDetail.setInOrderNumber(stockInOrder.getInOrderNumber());
inMaterialDetail.setUniqueId(idGenerator.snowflakeId(SnowFlakeConstants.wmsId)); inMaterialDetail.setUniqueId(idGenerator.snowflakeId(SnowFlakeConstants.wmsId));
inMaterialDetail.setInboundQuantity(investigetionManageDetail.getDifferentQuantity()); inMaterialDetail.setInboundQuantity(investigetionManageDetail.getDifferentQuantity());
inMaterialDetail.setQuantity(investigetionManageDetail.getDifferentQuantity());
//物料信息 //物料信息
inMaterialDetail.setMaterialBaseInfoId(investigetionManageDetail.getMaterialBaseInfoId()); inMaterialDetail.setMaterialBaseInfoId(investigetionManageDetail.getMaterialBaseInfoId());
inMaterialDetail.setMaterialCode(investigetionManageDetail.getMaterialCode()); inMaterialDetail.setMaterialCode(investigetionManageDetail.getMaterialCode());
@@ -327,6 +328,7 @@ public class DifferentManageImpl extends ServiceImpl<DifferentManageMapper, Diff
stockOutOrder.setDocumentCreatorName(userPo.getUserName()); stockOutOrder.setDocumentCreatorName(userPo.getUserName());
stockOutOrder.setDocumentDate(new Date()); stockOutOrder.setDocumentDate(new Date());
stockOutOrder.setNeedDeclareFlag("0"); stockOutOrder.setNeedDeclareFlag("0");
stockOutOrder.setQuantity(investigetionManageDetail.getDifferentQuantity());
//货主信息 //货主信息
Long materialBaseInfoId = investigetionManageDetail.getMaterialBaseInfoId(); Long materialBaseInfoId = investigetionManageDetail.getMaterialBaseInfoId();
@@ -354,7 +356,7 @@ public class DifferentManageImpl extends ServiceImpl<DifferentManageMapper, Diff
outMaterialDetail.setInOrderNumber(stockOutOrder.getOutOrderNumber()); outMaterialDetail.setInOrderNumber(stockOutOrder.getOutOrderNumber());
outMaterialDetail.setUniqueId(idGenerator.snowflakeId(SnowFlakeConstants.wmsId)); outMaterialDetail.setUniqueId(idGenerator.snowflakeId(SnowFlakeConstants.wmsId));
outMaterialDetail.setOutboundQuantity(investigetionManageDetail.getDifferentQuantity()); outMaterialDetail.setOutboundQuantity(investigetionManageDetail.getDifferentQuantity());
outMaterialDetail.setQuantity(investigetionManageDetail.getDifferentQuantity());
//物料信息 //物料信息
outMaterialDetail.setMaterialBaseInfoId(investigetionManageDetail.getMaterialBaseInfoId()); outMaterialDetail.setMaterialBaseInfoId(investigetionManageDetail.getMaterialBaseInfoId());
outMaterialDetail.setMaterialCode(investigetionManageDetail.getMaterialCode()); outMaterialDetail.setMaterialCode(investigetionManageDetail.getMaterialCode());
@@ -262,6 +262,7 @@ public class InventoryAdjustmentRecordDomainService {
stockInOrder.setDocumentCreator(userPo.getUserName()); stockInOrder.setDocumentCreator(userPo.getUserName());
stockInOrder.setDocumentCreatorName(userPo.getUserName()); stockInOrder.setDocumentCreatorName(userPo.getUserName());
stockInOrder.setDocumentDate(new Date()); stockInOrder.setDocumentDate(new Date());
stockInOrder.setQuantity(inventoryAdjustmentRecordDO.getAdjustQuantity());
//货主信息 //货主信息
stockInOrder.setShipperId(materialInventory.getShipperId()); stockInOrder.setShipperId(materialInventory.getShipperId());
@@ -287,7 +288,7 @@ public class InventoryAdjustmentRecordDomainService {
inMaterialDetail.setInOrderNumber(stockInOrder.getInOrderNumber()); inMaterialDetail.setInOrderNumber(stockInOrder.getInOrderNumber());
inMaterialDetail.setUniqueId(idGenerator.snowflakeId(SnowFlakeConstants.wmsId)); inMaterialDetail.setUniqueId(idGenerator.snowflakeId(SnowFlakeConstants.wmsId));
inMaterialDetail.setInboundQuantity(inventoryAdjustmentRecordDO.getAdjustQuantity()); inMaterialDetail.setInboundQuantity(inventoryAdjustmentRecordDO.getAdjustQuantity());
inMaterialDetail.setQuantity(inventoryAdjustmentRecordDO.getAdjustQuantity());
//物料信息 //物料信息
inMaterialDetail.setMaterialBaseInfoId(materialInventory.getMaterialBaseInfoId()); inMaterialDetail.setMaterialBaseInfoId(materialInventory.getMaterialBaseInfoId());
inMaterialDetail.setMaterialCode(inventoryAdjustmentRecordDO.getMaterialCode()); inMaterialDetail.setMaterialCode(inventoryAdjustmentRecordDO.getMaterialCode());
@@ -326,7 +327,7 @@ public class InventoryAdjustmentRecordDomainService {
stockOutOrder.setDocumentCreatorName(userPo.getUserName()); stockOutOrder.setDocumentCreatorName(userPo.getUserName());
stockOutOrder.setDocumentDate(new Date()); stockOutOrder.setDocumentDate(new Date());
stockOutOrder.setNeedDeclareFlag("0"); stockOutOrder.setNeedDeclareFlag("0");
stockOutOrder.setQuantity(inventoryAdjustmentRecordDO.getAdjustQuantity());
//货主信息 //货主信息
stockOutOrder.setShipperId(materialInventory.getShipperId()); stockOutOrder.setShipperId(materialInventory.getShipperId());
stockOutOrder.setShipperCode(materialInventory.getShipperCode()); stockOutOrder.setShipperCode(materialInventory.getShipperCode());
@@ -351,7 +352,7 @@ public class InventoryAdjustmentRecordDomainService {
outMaterialDetail.setInOrderNumber(stockOutOrder.getOutOrderNumber()); outMaterialDetail.setInOrderNumber(stockOutOrder.getOutOrderNumber());
outMaterialDetail.setUniqueId(idGenerator.snowflakeId(SnowFlakeConstants.wmsId)); outMaterialDetail.setUniqueId(idGenerator.snowflakeId(SnowFlakeConstants.wmsId));
outMaterialDetail.setOutboundQuantity(inventoryAdjustmentRecordDO.getAdjustQuantity()); outMaterialDetail.setOutboundQuantity(inventoryAdjustmentRecordDO.getAdjustQuantity());
outMaterialDetail.setQuantity(inventoryAdjustmentRecordDO.getAdjustQuantity());
//物料信息 //物料信息
outMaterialDetail.setMaterialBaseInfoId(materialInventory.getMaterialBaseInfoId()); outMaterialDetail.setMaterialBaseInfoId(materialInventory.getMaterialBaseInfoId());
outMaterialDetail.setMaterialCode(inventoryAdjustmentRecordDO.getMaterialCode()); outMaterialDetail.setMaterialCode(inventoryAdjustmentRecordDO.getMaterialCode());
@@ -1295,6 +1295,7 @@ public class StockReceiptOrderDomainService {
ShelfMaterialDetailDO shelfMaterialDetailDO = new ShelfMaterialDetailDO(); ShelfMaterialDetailDO shelfMaterialDetailDO = new ShelfMaterialDetailDO();
BeanUtils.copyProperties(receiptMaterialDetailPO, shelfMaterialDetailDO); BeanUtils.copyProperties(receiptMaterialDetailPO, shelfMaterialDetailDO);
shelfMaterialDetailDO.setLotNumber(receiptMaterialDetailPO.getLotNo());
shelfMaterialDetailDO.setQuantity(receiptMaterialDetailPO.getReceiptQuantity()); shelfMaterialDetailDO.setQuantity(receiptMaterialDetailPO.getReceiptQuantity());
shelfMaterialDetailDO.setInUniqueId(receiptMaterialDetailPO.getInUniqueId()); shelfMaterialDetailDO.setInUniqueId(receiptMaterialDetailPO.getInUniqueId());
shelfMaterialDetailDO.setReceiptUniqueId(receiptMaterialDetailPO.getUniqueId()); shelfMaterialDetailDO.setReceiptUniqueId(receiptMaterialDetailPO.getUniqueId());
@@ -1340,6 +1341,7 @@ public class StockReceiptOrderDomainService {
} }
ShelfMaterialDetailDO shelfMaterialDetailDOChildren = new ShelfMaterialDetailDO(); ShelfMaterialDetailDO shelfMaterialDetailDOChildren = new ShelfMaterialDetailDO();
BeanUtils.copyProperties(receiptMaterialDetailPOChildren, shelfMaterialDetailDOChildren); BeanUtils.copyProperties(receiptMaterialDetailPOChildren, shelfMaterialDetailDOChildren);
shelfMaterialDetailDOChildren.setLotNumber(receiptMaterialDetailPOChildren.getLotNo());
shelfMaterialDetailDOChildren.setQuantity(receiptMaterialDetailPOChildren.getReceiptQuantity()); shelfMaterialDetailDOChildren.setQuantity(receiptMaterialDetailPOChildren.getReceiptQuantity());
shelfMaterialDetailDOChildren.setInUniqueId(receiptMaterialDetailPO.getInUniqueId()); shelfMaterialDetailDOChildren.setInUniqueId(receiptMaterialDetailPO.getInUniqueId());
// 子项使用自身的 uniqueId 作为 receiptUniqueId,以便正确关联 material_more_detail 中的扩展属性 // 子项使用自身的 uniqueId 作为 receiptUniqueId,以便正确关联 material_more_detail 中的扩展属性