yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

收车、存放地点变更直接调拨单的数据对接

master
dimengzhe 3 years ago
parent
d43bf97c77
commit
0f468aef58
2 changed files with 39 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 25
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java
  2. 22
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

25
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java
View File

@ -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<ScmVehicle
@Autowired
FinKingDeeFeign finKingDeeFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private ScmWarehouseService scmWarehouseService;
private QueryWrapper<ScmVehicleEnterlibrary> createQueryWrapper(ScmVehicleEnterlibraryQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -338,15 +346,24 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
list.add(baseVehicleDto);
baseVehicleFeign.saveOrUpdate(list, OperVehicleState.EventType.UPDATE_VEHICLE.getCode());
//推送调拨单
//根据分公司sid查询分公司编码
String useOrgSid = scmVehicleEnterlibrary.getUseOrgSid();
ResultBean<SysOrganizationVo> sysOrg = sysOrganizationFeign.fetchBySid(useOrgSid);
SysOrganizationVo sysOrganizationVo = sysOrg.getData();
List<StkTransferDirect.FBillEntry> 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<String> resultBean = finKingDeeFeign.draftStkTransferDirect(stkTransferDirect);

22
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
View File

@ -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<ScmVehicleGres
BaseVehicleTempstateFeign baseVehicleTempstateFeign;
@Autowired
FinKingDeeFeign finKingDeeFeign;
@Autowired
private ScmWarehouseService scmWarehouseService;
private QueryWrapper<ScmVehicleGression> createQueryWrapper(ScmVehicleGressionQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -889,17 +893,27 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
//推送调拨单
List<String> vinList = scmVehicleGressionVehService.fetchVoByMainSid(bv.getBusinessSid());
if (vinList.size() > 0) {
//根据分公司sid查询分公司编码
String useOrgSid = scmVehicleGression.getUseOrgSid();
ResultBean<SysOrganizationVo> sysOrg = sysOrganizationFeign.fetchBySid(useOrgSid);
SysOrganizationVo sysOrganizationVo = sysOrg.getData();
for (String s : vinList) {
BaseVehicleVo baseVehicleVo = baseVehicleFeign.selVehicleByVinNo(s).getData();
List<StkTransferDirect.FBillEntry> 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);

Write Preview
Loading…
Cancel
Save