|
|
|
@ -38,6 +38,8 @@ import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign; |
|
|
|
import com.yxt.anrui.base.common.enums.BillTypeEnum; |
|
|
|
import com.yxt.anrui.base.common.utils.Rule; |
|
|
|
import com.yxt.anrui.base.common.utils.domain.BillNo; |
|
|
|
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; |
|
|
|
import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect; |
|
|
|
import com.yxt.anrui.flowable.api.flow.FlowableFeign; |
|
|
|
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; |
|
|
|
import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; |
|
|
|
@ -141,6 +143,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres |
|
|
|
private ScmVehicleGressionVehService scmVehicleGressionVehService; |
|
|
|
@Autowired |
|
|
|
BaseVehicleTempstateFeign baseVehicleTempstateFeign; |
|
|
|
@Autowired |
|
|
|
FinKingDeeFeign finKingDeeFeign; |
|
|
|
|
|
|
|
private QueryWrapper<ScmVehicleGression> createQueryWrapper(ScmVehicleGressionQuery query) { |
|
|
|
// todo: 这里根据具体业务调整查询条件
|
|
|
|
@ -259,6 +263,43 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres |
|
|
|
return qw; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public IPage<ScmVehicleGressionPageVo> selectCarTransferListAll(PagerQuery<ScmVehicleGressionPageQuery> pagerQuery) { |
|
|
|
IPage<ScmVehicleGressionPageQuery> page = PagerUtil.queryToPage(pagerQuery); |
|
|
|
QueryWrapper<ScmVehicleGressionPageVo> qw = new QueryWrapper<>(); |
|
|
|
qw.in("svg.sid", pagerQuery.getParams().getSids()); |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getParams().getUseOrgSid())) { |
|
|
|
qw.eq("svg.useOrgSid", pagerQuery.getParams().getUseOrgSid()); |
|
|
|
} |
|
|
|
IPage<ScmVehicleGressionPageVo> iPage = baseMapper.selectCarTransferList(page, qw); |
|
|
|
List<ScmVehicleGressionPageVo> records = iPage.getRecords(); |
|
|
|
for (ScmVehicleGressionPageVo record : records) { |
|
|
|
record.setVin(pagerQuery.getParams().getVin()); |
|
|
|
String sid = record.getSid(); |
|
|
|
String type1 = "04"; //保单照片
|
|
|
|
String type2 = "05"; //现场照片
|
|
|
|
List<String> policyImage = new ArrayList<>(); |
|
|
|
List<String> image = new ArrayList<>(); |
|
|
|
//查询出门证
|
|
|
|
|
|
|
|
ScmExitPermit scmExitPermit = scmExitPermitService.selectByLinkSid(record.getSid()); |
|
|
|
if (scmExitPermit != null) { |
|
|
|
record.setDownloadUrl(fileUploadComponent.getUrlPrefix() + scmExitPermit.getUrl()); |
|
|
|
} |
|
|
|
List<ScmFile> scmFiles1 = scmFileService.getByLinkSidAndType(sid, type1); |
|
|
|
for (ScmFile scmFile : scmFiles1) { |
|
|
|
policyImage.add(scmFile.getFilePath()); |
|
|
|
} |
|
|
|
record.setPolicyImage(policyImage); |
|
|
|
List<ScmFile> scmFiles2 = scmFileService.getByLinkSidAndType(record.getSid(), type2); |
|
|
|
for (ScmFile scmFile : scmFiles2) { |
|
|
|
image.add(scmFile.getFilePath()); |
|
|
|
} |
|
|
|
record.setImages(image); |
|
|
|
} |
|
|
|
return iPage; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 手机端-获取车辆移位列表 |
|
|
|
* |
|
|
|
@ -838,6 +879,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres |
|
|
|
UpdateFlowFieldVo ufVo = resultBean.getData(); |
|
|
|
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); |
|
|
|
if (!"Event_end".equals(ufVo.getTaskDefKey())) { |
|
|
|
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
//极光推送
|
|
|
|
scmVehicleGression = fetchBySid(bv.getBusinessSid()); |
|
|
|
ufVo.setProcInsId(scmVehicleGression.getProcInstId()); |
|
|
|
@ -854,6 +896,41 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres |
|
|
|
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery); |
|
|
|
//删除申请状态
|
|
|
|
baseVehicleTempstateFeign.delByBusSid(bv.getBusinessSid()); |
|
|
|
//推送调拨单
|
|
|
|
List<String> vinList = scmVehicleGressionVehService.fetchVoByMainSid(bv.getBusinessSid()); |
|
|
|
if (vinList.size() > 0) { |
|
|
|
for (String s : vinList) { |
|
|
|
BaseVehicleVo baseVehicleVo = baseVehicleFeign.selVehicleByVinNo(s).getData(); |
|
|
|
List<StkTransferDirect.FBillEntry> FPAYBILLENTRYs = new ArrayList<>(); |
|
|
|
StkTransferDirect stkTransferDirect = new StkTransferDirect(); |
|
|
|
stkTransferDirect.setFStockOutOrgId("100013"); //调出库存组织
|
|
|
|
stkTransferDirect.setFTransferBizType("调车"); //调拨类型
|
|
|
|
stkTransferDirect.setFTransferDirect("GENERAL"); //调拨方向
|
|
|
|
stkTransferDirect.setFOwnerTypeOutIdHead("BD_OwnerOrg"); //调出货主类型
|
|
|
|
stkTransferDirect.setFStockOrgId("BD_OwnerOrg"); //调入库存组织
|
|
|
|
stkTransferDirect.setFOwnerTypeIdHead("BD_OwnerOrg"); //调入货主类型
|
|
|
|
stkTransferDirect.setFBillTypeID("ZJDB01_SYS"); //单据类型
|
|
|
|
stkTransferDirect.setFDate(simpleDateFormat.format(baseVehicleVo.getPriceDate())); //日期
|
|
|
|
StkTransferDirect.FBillEntry fBillEntry = new StkTransferDirect.FBillEntry(); |
|
|
|
fBillEntry.setFDestStockStatusId("KC-001");//调入库存状态
|
|
|
|
fBillEntry.setFSrcStockStatusId("KC-001");//调出库存状态
|
|
|
|
fBillEntry.setFOwnerTypeId("BD_OwnerOrg");//调入货主类型
|
|
|
|
fBillEntry.setFKeeperOutId("101");//调出保管者
|
|
|
|
fBillEntry.setFOwnerOutId("101");//调出货主
|
|
|
|
fBillEntry.setFOwnerTypeOutId("BD_OwnerOrg");//调出货主类型
|
|
|
|
fBillEntry.setFOwnerId("101");//调入货主
|
|
|
|
fBillEntry.setFOwnerIdHead("101");//调入货主
|
|
|
|
fBillEntry.setFKeeperTypeOutId("BD_KeeperOrg");//调出保管者类型
|
|
|
|
fBillEntry.setFKeeperId("101");//调入保管者
|
|
|
|
fBillEntry.setFKeeperTypeId("BD_KeeperOrg");//调入保管者类型
|
|
|
|
fBillEntry.setFDestStockId("CK003");//调入仓库
|
|
|
|
fBillEntry.setFMaterialId(s);//物料编码
|
|
|
|
fBillEntry.setFSrcStockId("CK001");//调出仓库
|
|
|
|
FPAYBILLENTRYs.add(fBillEntry); |
|
|
|
stkTransferDirect.setFBillEntry(FPAYBILLENTRYs); |
|
|
|
finKingDeeFeign.draftStkTransferDirect(stkTransferDirect); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
return rb.success().setData(resultBean.getData()); |
|
|
|
@ -1150,7 +1227,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres |
|
|
|
* @param scmVehicleGression |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public String getMessage(UpdateFlowFieldVo ufVo, Map<String, Object> appMap, ScmVehicleGression scmVehicleGression) { |
|
|
|
public String getMessage(UpdateFlowFieldVo ufVo, Map<String, Object> appMap, ScmVehicleGression |
|
|
|
scmVehicleGression) { |
|
|
|
//=====极光推送信息========================================参数组装
|
|
|
|
String procId = scmVehicleGression.getProcInstId(); |
|
|
|
ResultBean<List<LatestTaskVo>> resultBean = flowTaskFeign.getLatestTasks(procId); |
|
|
|
|
