weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

库存调整记录添加入库单号 lotno;

Browse Source
This commit is contained in:
王奎兴
2026-04-17 21:42:43 +08:00
parent 05a999e2e1
commit c987ee31d6
4 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java
+1
View File
@@ -519,6 +519,7 @@ public class ReservationStockInOrderDomainService {
public Boolean pushInOrder(StockInOrder stockInOrder) {
ReservationStockInOrder reservationStockInOrder = new ReservationStockInOrder();
BeanUtils.copyProperties(stockInOrder, reservationStockInOrder);
reservationStockInOrder.setIssueStatus(4);
return stockInOrderService.save(reservationStockInOrder);
}
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java
+1
View File
@@ -206,6 +206,7 @@ public class ReservationStockOutOrderDomainService {
public Boolean pushOutOrder(StockOutOrder stockOutOrder) {
ReservationStockOutOrder reservationStockOutOrder = new ReservationStockOutOrder();
BeanUtils.copyProperties(stockOutOrder, reservationStockOutOrder);
reservationStockOutOrder.setIssueStatus(4);
return stockOutOrderService.save(reservationStockOutOrder);
}
mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/service/InventoryAdjustmentRecordDomainService.java
+10
View File
@@ -251,6 +251,7 @@ public class InventoryAdjustmentRecordDomainService {
stockInOrder.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
stockInOrder.setStatus(1);
stockInOrder.setAuditStatus(1);
stockInOrder.setNeedCustomsDeclaration(0);
stockInOrder.setCreateBy(loginUser.getUserid());
stockInOrder.setCreateByName(loginUser.getUserPo().getUserName());
stockInOrder.setCreateTime(new Date());
@@ -258,6 +259,9 @@ public class InventoryAdjustmentRecordDomainService {
stockInOrder.setInOrderNumber(OrderSequence.getOrderCode("RK"));
stockInOrder.setOrderTypeCode("ku_cun_tiao_zheng");
stockInOrder.setOrderTypeName("库存调整");
stockInOrder.setDocumentCreator(userPo.getUserId().toString());
stockInOrder.setDocumentCreatorName(userPo.getUserName());
stockInOrder.setDocumentDate(new Date());
//货主信息
stockInOrder.setShipperId(materialInventory.getShipperId());
@@ -301,6 +305,7 @@ public class InventoryAdjustmentRecordDomainService {
inMaterialDetail.setStorageLocationId(materialInventory.getStorageLocationId());
inMaterialDetail.setStorageLocationCode(materialInventory.getStorageLocationCode());
inMaterialDetail.setStorageLocationName(materialInventory.getStorageLocationName());
inMaterialDetail.setSingleGrossWeight(materialBaseInfo.getWeightLimit());
omsServiceFeign.pushInOrder(stockInOrder);
omsServiceFeign.pushInOrderDetail(inMaterialDetail);
} else {
@@ -317,6 +322,10 @@ public class InventoryAdjustmentRecordDomainService {
stockOutOrder.setOutOrderNumber(OrderSequence.getOrderCode("CK"));
stockOutOrder.setOrderTypeCode("ku_cun_tiao_zheng");
stockOutOrder.setOrderTypeName("库存调整");
stockOutOrder.setDocumentCreator(userPo.getUserId().toString());
stockOutOrder.setDocumentCreatorName(userPo.getUserName());
stockOutOrder.setDocumentDate(new Date());
stockOutOrder.setNeedDeclareFlag("0");
//货主信息
stockOutOrder.setShipperId(materialInventory.getShipperId());
@@ -360,6 +369,7 @@ public class InventoryAdjustmentRecordDomainService {
outMaterialDetail.setStorageLocationId(materialInventory.getStorageLocationId());
outMaterialDetail.setStorageLocationCode(materialInventory.getStorageLocationCode());
outMaterialDetail.setStorageLocationName(materialInventory.getStorageLocationName());
outMaterialDetail.setSingleGrossWeight(materialBaseInfo.getWeightLimit());
omsServiceFeign.pushOutOrder(stockOutOrder);
omsServiceFeign.pushOutOrderDetail(outMaterialDetail);
}
mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java
+4
View File
@@ -577,6 +577,10 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
inventoryAdjustmentRecord.setAdjustAfterStatusName(materialInventory.getMaterialStatusName() == null ? "" : materialInventory.getMaterialStatusName());
inventoryAdjustmentRecord.setAdjustBeforeStatusName(materialInventory.getMaterialStatusName() == null ? "" : materialInventory.getMaterialStatusName());
inventoryAdjustmentRecord.setMaterialBaseInfoId(materialInventory.getMaterialBaseInfoId());
inventoryAdjustmentRecord.setLotNumber(materialInventoryParamDO.getLotNumber());
inventoryAdjustmentRecord.setInOrderNumber(materialInventoryParamDO.getInOrderNumber());
if (ObjectUtil.isNotNull(materialBaseInfo)) {
inventoryAdjustmentRecord.setMaterialCode(materialBaseInfo.getMaterialCode());
inventoryAdjustmentRecord.setMaterialName(materialBaseInfo.getMaterialName());