From 0f468aef58e81a7bdfb763f249be425500b8525a Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Sat, 8 Oct 2022 13:52:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=BD=A6=E3=80=81=E5=AD=98=E6=94=BE?= =?UTF-8?q?=E5=9C=B0=E7=82=B9=E5=8F=98=E6=9B=B4=E7=9B=B4=E6=8E=A5=E8=B0=83?= =?UTF-8?q?=E6=8B=A8=E5=8D=95=E7=9A=84=E6=95=B0=E6=8D=AE=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmVehicleEnterlibraryService.java | 25 ++++++++++++++++--- .../ScmVehicleGressionService.java | 22 +++++++++++++--- 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java index 1b3bb6777a..471a473291 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java @@ -41,13 +41,17 @@ import com.yxt.anrui.base.common.enums.OperVehicleState; import com.yxt.anrui.base.common.enums.VehicleState; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; import com.yxt.anrui.scm.api.scmfile.ScmFile; import com.yxt.anrui.scm.api.scmvehicleenterlibrary.*; +import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouse; import com.yxt.anrui.scm.biz.scmfile.ScmFileService; +import com.yxt.anrui.scm.biz.scmwarehouse.ScmWarehouseService; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -106,6 +110,10 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService createQueryWrapper(ScmVehicleEnterlibraryQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -338,15 +346,24 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService sysOrg = sysOrganizationFeign.fetchBySid(useOrgSid); + SysOrganizationVo sysOrganizationVo = sysOrg.getData(); List FPAYBILLENTRYs = new ArrayList<>(); StkTransferDirect stkTransferDirect = new StkTransferDirect(); - stkTransferDirect.setFStockOutOrgId("101"); //调出库存组织 - stkTransferDirect.setFStockOrgId("101"); //调入库存组织 +// stkTransferDirect.setFStockOutOrgId("101"); //调出库存组织 +// stkTransferDirect.setFStockOrgId("101"); //调入库存组织 + stkTransferDirect.setFStockOutOrgId(sysOrganizationVo.getOrgCode()); //调出库存组织 + stkTransferDirect.setFStockOrgId(sysOrganizationVo.getOrgCode()); //调入库存组织 stkTransferDirect.setFDate(scmVehicleEnterlibrary.getInboundDate()); //日期 StkTransferDirect.FBillEntry fBillEntry = new StkTransferDirect.FBillEntry(); - fBillEntry.setFDestStockId("CK003");//调入仓库 + ScmWarehouse scmWarehouse = scmWarehouseService.fetchBySid(scmVehicleEnterlibrary.getLocationSid()); +// fBillEntry.setFDestStockId("CK003");//调入仓库 + fBillEntry.setFDestStockId(scmWarehouse.getWarehouseCode());//调入仓库 fBillEntry.setFMaterialId(scmVehicleEnterlibrary.getVinNo());//物料编码 - fBillEntry.setFSrcStockId("CK001");//调出仓库 +// fBillEntry.setFSrcStockId("CK001");//调出仓库 + fBillEntry.setFSrcStockId(scmWarehouse.getWarehouseCode());//调出仓库 FPAYBILLENTRYs.add(fBillEntry); stkTransferDirect.setFBillEntry(FPAYBILLENTRYs); ResultBean resultBean = finKingDeeFeign.draftStkTransferDirect(stkTransferDirect); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java index 9427a7198f..100cbf81dd 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java @@ -66,9 +66,11 @@ import com.yxt.anrui.scm.api.scmvehiclegression.flowable.ScmCarTransferTaskQuery import com.yxt.anrui.scm.api.scmvehiclegression.flowable.SubmitCarTransferDto; import com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVehDto; import com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVehVo; +import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouse; import com.yxt.anrui.scm.biz.scmexitpermit.ScmExitPermitService; import com.yxt.anrui.scm.biz.scmfile.ScmFileService; import com.yxt.anrui.scm.biz.scmvehiclegressionveh.ScmVehicleGressionVehService; +import com.yxt.anrui.scm.biz.scmwarehouse.ScmWarehouseService; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -144,6 +146,8 @@ public class ScmVehicleGressionService extends MybatisBaseService createQueryWrapper(ScmVehicleGressionQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -889,17 +893,27 @@ public class ScmVehicleGressionService extends MybatisBaseService vinList = scmVehicleGressionVehService.fetchVoByMainSid(bv.getBusinessSid()); if (vinList.size() > 0) { + //根据分公司sid查询分公司编码 + String useOrgSid = scmVehicleGression.getUseOrgSid(); + ResultBean sysOrg = sysOrganizationFeign.fetchBySid(useOrgSid); + SysOrganizationVo sysOrganizationVo = sysOrg.getData(); for (String s : vinList) { BaseVehicleVo baseVehicleVo = baseVehicleFeign.selVehicleByVinNo(s).getData(); List FPAYBILLENTRYs = new ArrayList<>(); StkTransferDirect stkTransferDirect = new StkTransferDirect(); - stkTransferDirect.setFStockOutOrgId("101"); //调出库存组织 - stkTransferDirect.setFStockOrgId("101"); //调入库存组织 +// stkTransferDirect.setFStockOutOrgId("101"); //调出库存组织 + stkTransferDirect.setFStockOutOrgId(sysOrganizationVo.getOrgCode()); //调出库存组织 +// stkTransferDirect.setFStockOrgId("101"); //调入库存组织 + stkTransferDirect.setFStockOrgId(sysOrganizationVo.getOrgCode()); //调入库存组织 stkTransferDirect.setFDate(simpleDateFormat.format(baseVehicleVo.getPriceDate())); //日期 StkTransferDirect.FBillEntry fBillEntry = new StkTransferDirect.FBillEntry(); - fBillEntry.setFDestStockId("CK003");//调入仓库 + ScmWarehouse scmWarehouse = scmWarehouseService.fetchBySid(scmVehicleGression.getTargetLocationSid()); +// fBillEntry.setFDestStockId("CK003");//调入仓库 + fBillEntry.setFDestStockId(scmWarehouse.getWarehouseCode());//调入仓库 fBillEntry.setFMaterialId(s);//物料编码 - fBillEntry.setFSrcStockId("CK001");//调出仓库 + scmWarehouse = scmWarehouseService.fetchBySid(scmVehicleGression.getLocationSid()); + fBillEntry.setFSrcStockId(scmWarehouse.getWarehouseCode());//调出仓库 +// fBillEntry.setFSrcStockId("CK001");//调出仓库 FPAYBILLENTRYs.add(fBillEntry); stkTransferDirect.setFBillEntry(FPAYBILLENTRYs); finKingDeeFeign.draftStkTransferDirect(stkTransferDirect);