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

推送oms报错问题修改;

Browse Source
This commit is contained in:
王奎兴
2026-04-22 18:15:24 +08:00
parent 5b792ccae5
commit 3ca94bc4cf
8 changed files with 1656 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/domain/differentManage/repository/persistence/DifferentManageImpl.java
+5 -7
View File
@@ -11,9 +11,7 @@ import com.mhd.common.core.utils.uuid.IdGenerator;
import com.mhd.common.security.utils.SecurityUtils;
import com.mhd.system.api.OmsServiceFeign;
import com.mhd.system.api.SystemServiceFeign;
import com.mhd.system.api.domain.InMaterialDetail;
import com.mhd.system.api.domain.OutMaterialDetail;
import com.mhd.system.api.domain.StockOutOrder;
import com.mhd.system.api.domain.*;
import com.mhd.system.api.model.LoginUser;
import com.mhd.wms.domain.differentManage.entity.DifferentManage;
import com.mhd.wms.domain.differentManage.repository.facade.IDifferentManageService;
@@ -243,7 +241,7 @@ public class DifferentManageImpl extends ServiceImpl<DifferentManageMapper, Diff
Integer investigationResult = investigetionManageDetail.getInvestigationResult();
if (investigationResult != null&&investigationResult == 1) {
//入库
com.mhd.system.api.domain.StockInOrder stockInOrder = new com.mhd.system.api.domain.StockInOrder();
com.mhd.system.api.domain.StockInOrderTZPD stockInOrder = new com.mhd.system.api.domain.StockInOrderTZPD();
stockInOrder.setOrganizationId(loginUser.getUserPo().getOrganizationId());
stockInOrder.setOrganizationName(loginUser.getUserPo().getOrganizationName());
stockInOrder.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
@@ -275,7 +273,7 @@ public class DifferentManageImpl extends ServiceImpl<DifferentManageMapper, Diff
InMaterialDetail inMaterialDetail = new InMaterialDetail();
InMaterialDetailTZPD inMaterialDetail = new InMaterialDetailTZPD();
//组织信息
inMaterialDetail.setOrganizationId(loginUser.getUserPo().getOrganizationId());
inMaterialDetail.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
@@ -311,7 +309,7 @@ public class DifferentManageImpl extends ServiceImpl<DifferentManageMapper, Diff
omsServiceFeign.pushInOrderDetail(inMaterialDetail);
} else if (investigationResult != null && investigationResult == 2) {
//出库
StockOutOrder stockOutOrder = new StockOutOrder();
StockOutOrderTZPD stockOutOrder = new StockOutOrderTZPD();
stockOutOrder.setOrganizationId(loginUser.getUserPo().getOrganizationId());
stockOutOrder.setOrganizationName(loginUser.getUserPo().getOrganizationName());
stockOutOrder.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
@@ -343,7 +341,7 @@ public class DifferentManageImpl extends ServiceImpl<DifferentManageMapper, Diff
OutMaterialDetail outMaterialDetail = new OutMaterialDetail();
OutMaterialDetailTZPD outMaterialDetail = new OutMaterialDetailTZPD();
//组织信息
outMaterialDetail.setOrganizationId(loginUser.getUserPo().getOrganizationId());
outMaterialDetail.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/service/InventoryAdjustmentRecordDomainService.java
+5 -8
View File
@@ -10,10 +10,7 @@ import com.mhd.common.core.utils.uuid.IdGenerator;
import com.mhd.common.core.web.domain.BaseVOEntity;
import com.mhd.common.security.utils.SecurityUtils;
import com.mhd.system.api.OmsServiceFeign;
import com.mhd.system.api.domain.InMaterialDetail;
import com.mhd.system.api.domain.MaterialInventoryOmsParamDO;
import com.mhd.system.api.domain.OutMaterialDetail;
import com.mhd.system.api.domain.StockOutOrder;
import com.mhd.system.api.domain.*;
import com.mhd.system.api.model.LoginUser;
import com.mhd.wms.domain.inventoryAdjustmentRecord.repository.facade.IInventoryAdjustmentRecordService;
import com.mhd.wms.domain.inventoryAdjustmentRecord.repository.po.InventoryAdjustmentRecordPO;
@@ -268,7 +265,7 @@ public class InventoryAdjustmentRecordDomainService {
MaterialBaseInfo materialBaseInfo = materialBaseInfoService.getById(materialInventory.getMaterialBaseInfoId());
Long adjustDirection = inventoryAdjustmentRecordDO.getAdjustDirection();
if (adjustDirection == 1) {
com.mhd.system.api.domain.StockInOrder stockInOrder = new com.mhd.system.api.domain.StockInOrder();
com.mhd.system.api.domain.StockInOrderTZPD stockInOrder = new com.mhd.system.api.domain.StockInOrderTZPD();
stockInOrder.setOrganizationId(loginUser.getUserPo().getOrganizationId());
stockInOrder.setOrganizationName(loginUser.getUserPo().getOrganizationName());
stockInOrder.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
@@ -298,7 +295,7 @@ public class InventoryAdjustmentRecordDomainService {
InMaterialDetail inMaterialDetail = new InMaterialDetail();
InMaterialDetailTZPD inMaterialDetail = new InMaterialDetailTZPD();
//组织信息
inMaterialDetail.setOrganizationId(loginUser.getUserPo().getOrganizationId());
inMaterialDetail.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
@@ -333,7 +330,7 @@ public class InventoryAdjustmentRecordDomainService {
omsServiceFeign.pushInOrder(stockInOrder);
omsServiceFeign.pushInOrderDetail(inMaterialDetail);
} else {
StockOutOrder stockOutOrder = new StockOutOrder();
StockOutOrderTZPD stockOutOrder = new StockOutOrderTZPD();
stockOutOrder.setOrganizationId(loginUser.getUserPo().getOrganizationId());
stockOutOrder.setOrganizationName(loginUser.getUserPo().getOrganizationName());
stockOutOrder.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
@@ -362,7 +359,7 @@ public class InventoryAdjustmentRecordDomainService {
OutMaterialDetail outMaterialDetail = new OutMaterialDetail();
OutMaterialDetailTZPD outMaterialDetail = new OutMaterialDetailTZPD();
//组织信息
outMaterialDetail.setOrganizationId(loginUser.getUserPo().getOrganizationId());
outMaterialDetail.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
mhd_wms/src/main/java/com/mhd/wms/domain/investigationManage/repository/persistence/InvestigationManageImpl.java
+5 -8
View File
@@ -19,10 +19,7 @@ import com.mhd.common.security.utils.SecurityUtils;
import com.mhd.system.api.OmsServiceFeign;
import com.mhd.system.api.SystemServiceFeign;
import com.mhd.system.api.UserServiceFeign;
import com.mhd.system.api.domain.InMaterialDetail;
import com.mhd.system.api.domain.OutMaterialDetail;
import com.mhd.system.api.domain.StockOutOrder;
import com.mhd.system.api.domain.WarehouseFeignPO;
import com.mhd.system.api.domain.*;
import com.mhd.system.api.model.LoginUser;
import com.mhd.wms.domain.deliveTask.repository.facade.IDeliveTaskTypeService;
import com.mhd.wms.domain.deliveTask.repository.todo.DeliveTaskDO;
@@ -432,7 +429,7 @@ public class InvestigationManageImpl extends ServiceImpl<InvestigationManageMapp
Integer investigationResult = investigetionManageDetail.getInvestigationResult();
if (investigationResult != null&&investigationResult == 1) {
//入库
com.mhd.system.api.domain.StockInOrder stockInOrder = new com.mhd.system.api.domain.StockInOrder();
com.mhd.system.api.domain.StockInOrderTZPD stockInOrder = new com.mhd.system.api.domain.StockInOrderTZPD();
stockInOrder.setOrganizationId(loginUser.getUserPo().getOrganizationId());
stockInOrder.setOrganizationName(loginUser.getUserPo().getOrganizationName());
stockInOrder.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
@@ -459,7 +456,7 @@ public class InvestigationManageImpl extends ServiceImpl<InvestigationManageMapp
InMaterialDetail inMaterialDetail = new InMaterialDetail();
InMaterialDetailTZPD inMaterialDetail = new InMaterialDetailTZPD();
//组织信息
inMaterialDetail.setOrganizationId(loginUser.getUserPo().getOrganizationId());
inMaterialDetail.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
@@ -494,7 +491,7 @@ public class InvestigationManageImpl extends ServiceImpl<InvestigationManageMapp
omsServiceFeign.pushInOrderDetail(inMaterialDetail);
} else if (investigationResult != null && investigationResult == 2) {
//出库
StockOutOrder stockOutOrder = new StockOutOrder();
StockOutOrderTZPD stockOutOrder = new StockOutOrderTZPD();
stockOutOrder.setOrganizationId(loginUser.getUserPo().getOrganizationId());
stockOutOrder.setOrganizationName(loginUser.getUserPo().getOrganizationName());
stockOutOrder.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
@@ -521,7 +518,7 @@ public class InvestigationManageImpl extends ServiceImpl<InvestigationManageMapp
OutMaterialDetail outMaterialDetail = new OutMaterialDetail();
OutMaterialDetailTZPD outMaterialDetail = new OutMaterialDetailTZPD();
//组织信息
outMaterialDetail.setOrganizationId(loginUser.getUserPo().getOrganizationId());
outMaterialDetail.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());