From a8b4119993dbae2020ca066ad294178fcfc5a93b Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Wed, 19 Oct 2022 08:42:17 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E5=AD=98=E6=94=BE=E5=9C=B0=E7=82=B9?=
=?UTF-8?q?=E5=8F=98=E6=9B=B4=E7=94=9F=E6=88=90=E5=87=BA=E9=97=A8=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/application-test.yml | 4 +-
.../ScmVehicleGressionService.java | 196 +++++++--
.../src/main/resources/application-test.yml | 6 +-
.../{出门证模板.ftl => ftl/outdoor.ftl} | 389 +++++++++++-------
.../src/main/resources/临时出门证.docx | Bin 12876 -> 13465 bytes
5 files changed, 403 insertions(+), 192 deletions(-)
rename anrui-scm/anrui-scm-biz/src/main/resources/{出门证模板.ftl => ftl/outdoor.ftl} (86%)
diff --git a/anrui-base/anrui-base-biz/src/main/resources/application-test.yml b/anrui-base/anrui-base-biz/src/main/resources/application-test.yml
index a3bef1c3ef..fb491f46e3 100644
--- a/anrui-base/anrui-base-biz/src/main/resources/application-test.yml
+++ b/anrui-base/anrui-base-biz/src/main/resources/application-test.yml
@@ -27,5 +27,5 @@ image:
url:
prefix: http://anrui.yyundong.com/upload/
templateUrl:
- uploadUrl: http://anrui.yyundong.com/template
- prefixUrl: /home/lzh/webapps/template/
+ uploadUrl: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload/template/
+ prefixUrl: http://anrui.yyundong.com/upload/template/
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 321e3cde80..457e22ef33 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
@@ -30,6 +30,7 @@ import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.yxt.anrui.base.api.basevehicle.*;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto;
@@ -71,9 +72,12 @@ 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.DocPdfComponent;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.WordConvertUtils;
+import com.yxt.common.base.utils.WordUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@@ -81,14 +85,19 @@ import com.yxt.messagecenter.api.message.MessageFeign;
import com.yxt.messagecenter.api.message.MessageFlowVo;
import com.yxt.messagecenter.api.message.MessageFlowableQuery;
import org.apache.commons.lang3.StringUtils;
+import org.apache.tomcat.util.threads.ThreadPoolExecutor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.io.File;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.*;
import java.util.stream.Collectors;
+import static cn.hutool.core.util.ClassLoaderUtil.getClassLoader;
+
/**
* Project: scm(scm)
* File: ScmVehicleGressionService.java
@@ -148,6 +157,8 @@ public class ScmVehicleGressionService extends MybatisBaseService createQueryWrapper(ScmVehicleGressionQuery query) {
// todo: 这里根据具体业务调整查询条件
@@ -219,7 +230,7 @@ public class ScmVehicleGressionService extends MybatisBaseService scmFiles1 = scmFileService.getByLinkSidAndType(sid, type1);
for (ScmFile scmFile : scmFiles1) {
@@ -329,7 +340,7 @@ public class ScmVehicleGressionService extends MybatisBaseService list = scmFileService.getByLinkSidAndType(record.getSid(), type);
if (list.size() > 0) {
@@ -855,18 +866,87 @@ public class ScmVehicleGressionService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
- if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
- /* String pdfPath = createPdf(bv.getBusinessSid());
- //将生成的出门证添加到出门证表中
- ScmExitPermit scmExitPermit = new ScmExitPermit();
- scmExitPermit.setLinkSid(bv.getBusinessSid());
- scmExitPermit.setUrl(pdfPath);
- scmExitPermitService.insert(scmExitPermit);*/
+ UpdateFlowFieldVo ufVo = resultBean.getData();
+ updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+ try {
+ ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+ .setNameFormat("demo-pool-%d").build();
+ ExecutorService pool = new ThreadPoolExecutor(2, 100,
+ 0L, TimeUnit.MILLISECONDS,
+ new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+ if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+ Future future1 = pool.submit(() -> {
+ String pdfPath = createPdf(bv.getBusinessSid());
+ //将生成的出门证添加到出门证表中
+ ScmExitPermit scmExitPermit = new ScmExitPermit();
+ scmExitPermit.setLinkSid(bv.getBusinessSid());
+ scmExitPermit.setUrl(pdfPath);
+ scmExitPermitService.insert(scmExitPermit);
+ });
+ ScmVehicleGression finalScmVehicleGression = scmVehicleGression;
+ Future future2 = pool.submit(() -> {
+ //推送调拨单
+ List vinList = scmVehicleGressionVehService.fetchVoByMainSid(bv.getBusinessSid());
+ if (vinList.size() > 0) {
+ //根据分公司sid查询分公司编码
+ String useOrgSid = finalScmVehicleGression.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.setFStockOrgId(sysOrganizationVo.getOrgCode()); //调入库存组织
+ stkTransferDirect.setFDate(simpleDateFormat.format(baseVehicleVo.getPriceDate())); //日期
+ StkTransferDirect.FBillEntry fBillEntry = new StkTransferDirect.FBillEntry();
+ ScmWarehouse scmWarehouse = scmWarehouseService.fetchBySid(finalScmVehicleGression.getTargetLocationSid());
+ fBillEntry.setFDestStockId(scmWarehouse.getGressionCode());//调入仓库
+ fBillEntry.setFMaterialId(s);//物料编码
+ scmWarehouse = scmWarehouseService.fetchBySid(finalScmVehicleGression.getLocationSid());
+ fBillEntry.setFSrcStockId(scmWarehouse.getGressionCode());//调出仓库
+ FPAYBILLENTRYs.add(fBillEntry);
+ stkTransferDirect.setFBillEntry(FPAYBILLENTRYs);
+ finKingDeeFeign.draftStkTransferDirect(stkTransferDirect);
+ }
+ }
+
+ });
+ } else {
+ //极光推送
+ scmVehicleGression = fetchBySid(bv.getBusinessSid());
+ ufVo.setProcInsId(scmVehicleGression.getProcInstId());
+ MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+ MessageFlowVo messageFlowVo = new MessageFlowVo();
+ BeanUtil.copyProperties(ufVo, messageFlowVo);
+ ufVo.setProcInsId(scmVehicleGression.getProcInstId());
+ messageFlowableQuery.setUfVo(messageFlowVo);
+ messageFlowableQuery.setAppMap(appMap);
+ messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
+ messageFlowableQuery.setModuleName("存放地点变更申请");
+ messageFlowableQuery.setMsgContent(scmVehicleGression.getApplicantName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+ messageFlowableQuery.setMsgTitle("存放地点变更");
+ ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+ }
+
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return rb.success().setData(resultBean.getData());
+ } else {
+ return rb.setMsg("操作失败!提交的数据不一致");
+ }
+ //===============================添加多线程结束======================
+ /*if (bv.getTaskId().equals(scmVehicleGression.getTaskId())) {
+ ResultBean resultBean = flowableFeign.handleProsess(bv);
+ if (!resultBean.getSuccess()) {
+ return rb.setMsg(resultBean.getMsg());
}
UpdateFlowFieldVo ufVo = resultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
@@ -887,15 +967,6 @@ public class ScmVehicleGressionService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
} else {
-// //推送车辆台账数据
-// VehicleGression vehicleGression = new VehicleGression();
-// List list = scmVehicleGressionVehService.fetchVoByMainSid(scmVehicleGression.getSid());
-// vehicleGression.setVin(list);
-// vehicleGression.setLocation(scmVehicleGression.getTargetLocationSid());
-// vehicleGression.setLocationName(scmVehicleGression.getTargetLocation());
-// baseVehicleFeign.updateVehicleGressionByVin(vehicleGression);
-// //删除申请状态
-// baseVehicleTempstateFeign.delByBusSid(bv.getBusinessSid());
//推送调拨单
List vinList = scmVehicleGressionVehService.fetchVoByMainSid(bv.getBusinessSid());
if (vinList.size() > 0) {
@@ -907,19 +978,14 @@ public class ScmVehicleGressionService extends MybatisBaseService FPAYBILLENTRYs = new ArrayList<>();
StkTransferDirect stkTransferDirect = new StkTransferDirect();
-// 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();
ScmWarehouse scmWarehouse = scmWarehouseService.fetchBySid(scmVehicleGression.getTargetLocationSid());
-// fBillEntry.setFDestStockId("CK003");//调入仓库
fBillEntry.setFDestStockId(scmWarehouse.getGressionCode());//调入仓库
fBillEntry.setFMaterialId(s);//物料编码
scmWarehouse = scmWarehouseService.fetchBySid(scmVehicleGression.getLocationSid());
fBillEntry.setFSrcStockId(scmWarehouse.getGressionCode());//调出仓库
-// fBillEntry.setFSrcStockId("CK001");//调出仓库
FPAYBILLENTRYs.add(fBillEntry);
stkTransferDirect.setFBillEntry(FPAYBILLENTRYs);
finKingDeeFeign.draftStkTransferDirect(stkTransferDirect);
@@ -930,7 +996,7 @@ public class ScmVehicleGressionService extends MybatisBaseService> rb = new ResultBean<>();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
-// Map formVariables = query.getFormVariables();
- //判断流程分支
-// Map map = IsTrue(formVariables.get("businessSid"));
-// bv.setFormVariables(map);
bv.setModelId(ProcDefEnum.SCMCARTRANSFER.getProDefId());
ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
@@ -964,13 +1026,8 @@ public class ScmVehicleGressionService extends MybatisBaseService> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
-// Map formVariables = query.getFormVariables();
- //判断流程分支
-// Map map = IsTrue(formVariables.get("businessSid"));
-// bv.setFormVariables(map);
bv.setModelId(ProcDefEnum.SCMCARTRANSFER.getProDefId());
ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
- //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
return rb.success().setData(voList);
}
@@ -1188,10 +1245,11 @@ public class ScmVehicleGressionService extends MybatisBaseService dataMap = new HashMap();
dataMap.put("date", DateUtil.today());
@@ -1227,7 +1285,73 @@ public class ScmVehicleGressionService extends MybatisBaseService vinList = new ArrayList<>();
+ List vinSidList = new ArrayList<>();
+ List scmVehicleGressionVehVos = scmVehicleGressionVehService.selectInfoVoByMainSid(sid);
+ if (scmVehicleGressionVehVos.size() > 0) {
+ for (ScmVehicleGressionVehVo v : scmVehicleGressionVehVos) {
+ String vehSid = v.getVehSid();
+ String vin = v.getVehVin();
+ vinList.add(vin);
+ vinSidList.add(vehSid);
+ }
+ }
+ String vin = String.join(",", vinList);
+ List modelNameList = new ArrayList<>();
+ for (String vinSid : vinSidList) {
+ BaseVehicleSelectVo data = baseVehicleFeign.details(vinSid).getData();
+ ExiCarConfigDetailVo exiCarConfigDetailVo = baseVehicleFeign.selectExiCarConfig(data.getModelSid(), data.getModelConfigSid(), data.getVehModelConfigSid()).getData();
+ String model = exiCarConfigDetailVo.getVehicleAlias() + exiCarConfigDetailVo.getCarColor();
+ modelNameList.add(model);
+ }
+ String modelName = String.join(",", modelNameList);
+ Map dataMap = new HashMap();
+ //日期
+ dataMap.put("date", DateUtil.today());
+ //合同编号
+ dataMap.put("contract", "—");
+ //机构名称
+ dataMap.put("orgName", sysOrganization.getName());
+ //客户名称
+ dataMap.put("name", "—");
+ //车型
+ dataMap.put("modelName", modelName);
+ //台数
+ dataMap.put("number", vinSidList.size());
+ dataMap.put("vinNo", vin);
+ //出门原因
+ dataMap.put("reason", "存放地点变更");
+ //业务经办人
+ dataMap.put("operator", scmVehicleGression.getOperator());
+ //财务经办人
+// dataMap.put("finOperator", "-");
+ //提车人
+ dataMap.put("carCollector", "—");
+ //出门签章
+// dataMap.put("signature", "-");
+ //申请人
+ dataMap.put("apply", scmVehicleGression.getApplicantName());
+ //获取模板
+ File file = new File(getClass().getClassLoader().getResource("ftl/outdoor.ftl").getFile());
+ String dir = getClassLoader().getResource("ftl").getPath();
+ //生成word文件名
+ String targetPath = docPdfComponent.getUploadTemplateUrl();
+ String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
+ long seconds = System.currentTimeMillis();
+ String typeName = dateStr + seconds + ".doc";
+ WordConvertUtils.creatWord(dataMap, file, targetPath, typeName,dir);
+ //新生成的word路径
+ String wordPath = targetPath + typeName;
+ //生成出门证文件名
+ String pdfName = "出门证_" + dateStr + seconds + ".pdf";
+ WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
+ return pdfName;
+ }
public ResultBean getToDoNum(String userSid) {
ResultBean rb = ResultBean.fireFail();
diff --git a/anrui-scm/anrui-scm-biz/src/main/resources/application-test.yml b/anrui-scm/anrui-scm-biz/src/main/resources/application-test.yml
index 1731237fe6..af4e0af83a 100644
--- a/anrui-scm/anrui-scm-biz/src/main/resources/application-test.yml
+++ b/anrui-scm/anrui-scm-biz/src/main/resources/application-test.yml
@@ -23,4 +23,8 @@ image:
upload:
path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload/
url:
- prefix: http://anrui.yyundong.com/upload/
\ No newline at end of file
+ prefix: http://anrui.yyundong.com/upload/
+
+templateUrl:
+ uploadUrl: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload/template/
+ prefixUrl: http://anrui.yyundong.com/upload/template/
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/resources/出门证模板.ftl b/anrui-scm/anrui-scm-biz/src/main/resources/ftl/outdoor.ftl
similarity index 86%
rename from anrui-scm/anrui-scm-biz/src/main/resources/出门证模板.ftl
rename to anrui-scm/anrui-scm-biz/src/main/resources/ftl/outdoor.ftl
index 6e261d4fc3..23c3833596 100644
--- a/anrui-scm/anrui-scm-biz/src/main/resources/出门证模板.ftl
+++ b/anrui-scm/anrui-scm-biz/src/main/resources/ftl/outdoor.ftl
@@ -31,18 +31,18 @@
孟哲
2
1
- 2022-09-08T01:57:00Z
- 2022-09-08T01:57:00Z
+ 2022-10-18T08:53:00Z
+ 2022-10-18T08:53:00Z
1
- 36
- 211
+ 35
+ 204
1
1
- 246
+ 238
16
- 2052-11.1.0.12313
+ 2052-11.1.0.12598
3B16B84811D744B6BD39F9CF2DD198E0
@@ -571,47 +571,81 @@
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -621,40 +655,77 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -664,7 +735,7 @@
-
+
@@ -695,7 +766,7 @@
+ w:tblpX="1642" w:tblpY="2608"/>
@@ -710,18 +781,23 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
@@ -730,19 +806,17 @@
-
+
-
-
-
+
@@ -757,7 +831,8 @@
-
+
+
@@ -766,18 +841,16 @@
-
+
-
-
-
+
@@ -790,7 +863,7 @@
-
+
@@ -799,19 +872,17 @@
-
+
-
-
-
+
@@ -826,7 +897,8 @@
-
+
+
@@ -835,57 +907,49 @@
-
+
-
-
-
+
- ${application!}
+ ${apply!}
-
-
-
-
-
-
+
+
-
-
+
+
-
+
-
+
-
-
-
+
@@ -894,46 +958,50 @@
- 客户名称：
+ 合同编号：
-
+
-
-
+
+
-
+
-
+
-
-
-
+
- ${name!}
+ ${contract!}
+
+
+
+
+
-
+
+
@@ -942,17 +1010,19 @@
-
+
+
+
-
+
@@ -961,13 +1031,14 @@
- 合同编号：
+ 客户名称：
-
+
+
@@ -976,34 +1047,32 @@
-
+
+
+
-
+
- ${contractNo!}
+ ${name!}
-
-
-
-
-
-
+
+
@@ -1012,19 +1081,17 @@
-
+
-
-
-
+
@@ -1033,13 +1100,14 @@
- 车型名称：
+ 台数：
-
+
+
@@ -1048,31 +1116,35 @@
-
+
-
-
-
+
- ${modelName!}
+ ${number!}
+
+
+
+
+
-
+
+
@@ -1081,8 +1153,8 @@
-
+
@@ -1093,7 +1165,7 @@
-
+
@@ -1102,13 +1174,14 @@
- 台数：
+ 车型名称：
-
+
+
@@ -1117,8 +1190,8 @@
-
+
@@ -1128,22 +1201,23 @@
-
+
- ${number!}
+ ${modelName!}
-
+
+
@@ -1152,8 +1226,8 @@
-
+
@@ -1164,7 +1238,7 @@
-
+
@@ -1180,7 +1254,7 @@
-
+
@@ -1189,8 +1263,8 @@
-
+
@@ -1200,22 +1274,23 @@
-
+
- ${vinNo!}
+ ${vinNo!}
-
+
+
@@ -1224,8 +1299,8 @@
-
+
@@ -1236,7 +1311,7 @@
-
+
@@ -1252,7 +1327,7 @@
-
+
@@ -1261,8 +1336,8 @@
-
+
@@ -1272,7 +1347,7 @@
-
+
@@ -1284,10 +1359,11 @@
-
+
+
@@ -1296,8 +1372,8 @@
-
+
@@ -1308,7 +1384,7 @@
-
+
@@ -1324,6 +1400,7 @@
+
@@ -1332,8 +1409,8 @@
-
+
@@ -1343,7 +1420,7 @@
-
+
@@ -1357,6 +1434,7 @@
+
@@ -1365,8 +1443,8 @@
-
+
@@ -1377,7 +1455,7 @@
-
+
@@ -1393,6 +1471,7 @@
+
@@ -1401,8 +1480,8 @@
-
+
@@ -1412,22 +1491,23 @@
-
+
- ${finOperator!}
+ ${finOperator!}
-
+
+
@@ -1436,8 +1516,8 @@
-
+
@@ -1448,7 +1528,7 @@
-
+
@@ -1464,6 +1544,7 @@
+
@@ -1472,8 +1553,8 @@
-
+
@@ -1483,20 +1564,21 @@
-
+
- ${carCollector!}
+ ${carCollector!}
+
@@ -1505,8 +1587,8 @@
-
+
@@ -1517,7 +1599,7 @@
-
+
@@ -1533,6 +1615,7 @@
+
@@ -1541,8 +1624,8 @@
-
+
@@ -1552,7 +1635,7 @@
-
+
@@ -1565,14 +1648,14 @@
-
+
-
+
diff --git a/anrui-scm/anrui-scm-biz/src/main/resources/临时出门证.docx b/anrui-scm/anrui-scm-biz/src/main/resources/临时出门证.docx
index 1350a8997e9bd3ff12f9887935729efc0dfc1055..9dedca1995bb1d3fa57b45fa713970541abdfe39 100644
GIT binary patch
delta 6978
zcmZ8mRZtw-vK`!EaCZwfKyZS)1b2508ZtOcAh^R2+}+)R6Ff+8cMa}tFQ;z3I(2V<
z^iQw-v#NIY>RzLksdjNZC|%;ASmrPQ061QR2$G=Y9LRweyq#?$vjwXGE3MZhbpapWujuqj+DJk0Dy1dA2v_w`zf$4=x5Lcvdkbg%B4^63;@-
zG2%w2{hgXsuk5=HvTgn^lvGjBFTBD|Tg_^hmuU#YmPrWPYWncy{7QlE#-?1kqx0wt
z%(y@PbgKPeYBP3HNj|9B+H-qEFRH2t2ag8;0FVKp%3ERvCU~$4f7y411pu%C&?y*v
zh>2n^2VVa=LYL&QPkO9%N9n-NuHEd#nPJlwJC
zJI^~zkTIWG3LHaL=pItGtFM~))FFqKcuy6DqhymK;d5>~&d#o2mwHSl)HWW7M&gSj
zKfqg9)>Oy8cXo={%>dYtkY7
zhNLr+f$%X_vBh*LS$VeN&o01!Q_Z%&`vEEr#|hzD!kn(4q9Eh@{nDU#jp_zTylsI5
zC>T-{+DnLO=sA-A#8St5>0slrJiP(Fy2kZKOx4pw|!`DTHJ98IfV%E8dj?gXlj!r(+0aA6^bU!^M%*
z=fZzOL%ndST^m6L0KSkwK|mr1@uJhR+@)W@3zFnn%#)KkkUA0>eN00r`6vMKqdR!DIHK$Mv4d5aLSlLk3>L|E9y+GeEcedT@z}3t
zpMT{}%WN>xuB^|i`uT9o*-&q?{`zFnb-eHRN3dls3lLtGnOuIgSabwwx~i{tZ$z=0
z>nv@~h23ymP1HlG9$VE*<+*D+IVb})>m{>a(VS8ICZe`?r_#v&?XJWl8pqFerKQn)
z<2au`dbGUki;wxn5Vco*PR?o6vGhIn5HZF^>77_et3BUCQ)bC`NHR%DOKO>+QdZHGPXZ#EAAV-aAiRHj=zsxn8M=uXk(ebO1h0`A~QXU<4{N|vr
zUlc-$^LHFCP$@5N|MX)$)D5RijsXGe1q)5?^X}k-I*?CM^ZMEPaq~&K78tk{JpWD<
zZUWoRUA=0L&_iq0as>9Ln@ayNTi>3BQ8MGx11~p=3m-f$b$vaA0{F{Hmz`o6l-OC-
z>dtQ%m=FhB)mhfoUuAb_)aXz6o*#|`i@3zQdjRym-ZaHseFnPmH1DRO$o2OT9*tRMZlJFSppEM0o
ztj{XF!lzjUf7pT)#cjs^CK6rA9(v7Q)_Sqiscc=1<9I_+x={~`->`@BETTHN#!Up`
zDH(lqcuI7pqA{5e*uZGa@lZx9Lonep5s7jdj;PQNMyO$yxLiQcIqM#InO5pNW2TTWZQ)KD?AJBz`KqNY;SyUMn&+ig-HR^P#sC@5C_R0(
zW4J?>6q1CbJqM{_Y{Fs_BEqq@4#H-rgCn1rQtV$SDiS4$DQGq+<<7ZaBxciJX&YjX
z1|83-;n>BuAD#|hqZWa;2^|*1xnB9o2u#1glH`1S*Fl;+s
z82KrliW;vA8?QbqcNs%W{NEnG46|p0?sWJ>-u_hmisd6z
zF>wZ6EwBIn?ZXprh2}r8Fb}u=y2+JT#sr%}hY~JC&NeN{h)kV!l}P^US1hnNm4>7z
zR~gVKsrmAiHb|>90!YRborn@bYec6Wexc@~Y!{`fv1I4S3OmW2$GSyCr=0Q;tML}8
zv~eCXrH{_Yi|xiKS&}McD^CwA&t0rpjNC_39j(YAXWzJi7*LSGk#5dk>dJbN0`?`7
z57wXYk<X8bI1HRG3la8V-Cy=er$
zn^&$Qx?tKxVdNF3$wIZ0w&zfyKWEepQgwmEP*F_FrXwGRh<`jTnU?F*fPPN1A4Lq`
z8fC5Kls-trzVX;93K-
zNkn<7VNbS&0PJQyi4U`pkaU-oE4;sY94O%XB}K%;X1-aoV8)4@#60R$>%nUN+6aN9
zm<3@+Thek(*)wq}Me}^rh*GgPw^IFGm?Y6LaD8FOHO{%%jyq-MIu@?Y9E}|*amkPE
zLs!O+AIKkINekb&$t>g0of;LyDM#jF&C`e;&OH8OVw7fXbH(*1n@qG1i^X4dSmb#)
zQ;JkyQq{wxz32*JxDmrEp~hxu1LF{2fc^|JiWWhAx_pK^9&}8X*)DLCPECP+kgf&?
zmQ&oD!$UQhO?%sm#D^IBMQ)Erdc}5NcTS_)ULyA(|TyhJ!lsd5J
zJh^6GfH5U7<}?nKB?u2a4Ka`whmm#A5?5Q!8JiS&6CWEjoSB+>Tg)XWmH-m}9yWML
zGYmeT0Q=`Q(Xc7@Vvy{@HQmQP1mplYQ#QJ0sb@H?Sn*;mWaYGiC5s!Sf{FTuZif>y
z0$jw}Mmp6enu^~&nv9+i(%*N&3pmB=D5y{wF#DWT4Lj;^E=n~&a)g4FN>R}LNNNLS
zy4QR@W)BH6o1-InM}1lAY$|~S!Qc=Whe0g!ECy;apz;-_Xx}`Q8JOZ%%y4v(K=^XP
zaUkXIIw>Nhp~kUFaZ_AK76J?~n!=7XhgeKo(h*?&epd8kT_w#8vSHx_dJZJwU#euP
zVFj4+N_K^*^1!2a^dVhH01edXF
zSe>aFHuWSL*Z0joU&?dHI6}ZSy8<)!b}+Y>Ix&|?ERp^1(6zD@M%~gL;qA%Pae4R?
zy`ul*|Cr-2rim{Rh{9l%c(04b&^SmUY8GQx3e*ARpwM
z;fy#BkDlTPrvl>kILJacO?2oUh+Fg)dj4|h$D4zEY@
zOeTYR)6RTv8w474gn1pjBdjMOm&nPB?jJxh$sX6f+Sfi(OZnjQrVtg%-jT}~a#M$|
zJqB2$#&ufNtSbg0Lf3=?vMpdw{;Z3GD9YcawW4ddgIofc!`rE8;~Uc>{+$8B1{yoF
z!mPN(gRjp`pa^fuxwE3)tHtvCN#tIVlRSO=Ht<(K0J)}*8k^w#`Lx0P{f|EZc0~Y*2un04_$^o)6GdW?
zMRL=xJl{`*ZcJKIUvlKa6X<`%99WusbZh(oY5UMtf3UH|Fid+Ws<|yPx
zg9GbAr*wMEdKIa2hZop&RX2?2BE7G$(}?f(WXRL?>c@KfL^)6C?2SV<8vsSL>;|^n
z=?f8>eWAJ~*dbO*G0P&DJCCi&QmtCbfNii&QJ92Rao5T%^^GuSrY;}(aGB;66pk(r
z87D22fm;r3)#tuOj!d#$0C~~1FJce`c#EY>yBLO^z@6-BNr%iuJN=or{6?^iXcnJl
z8|Pbsvnj{^{t%zOS`PD^L^1b7g0zGZoMAc<-9D2ONj_V!DxbMRT=mkc>LHC#vY(&W}JW{?2b|5b`2^j2>3P~1N~bxCPt@(s##c#mVH3r_WMZNm
zw+M(g%tjO4Q~_noTRV)MO9`bElh_Fpg053p=B&S?*orUY`AQN2W
zXz!>77%Ge~mR1IBy5CliA1p#o+HNJPn-o`CYt0iqWr`0<3asL+JN)zn&sxLXd)G#o0#qY&hZnXb8BdrQ4HCieQ_JtBf&k^8~Y3rAvk&b
z^aP`C%-LlU^wz+W*@eC8SSJg5$Vbh7I~4&n{lpi<$c;r9kx|ER^OBo5DO7+Wm48@6knE
zmKzO@?d3Z7PJ~lb_XKTiQ_z&#xYAI)GmLI4F%ifK;&_qqMkPro(2J>0Ak6`D_JvV;
z=Qo+HYQ{#!u}A*owm;~;nt09ok*;l1LXd_#T5Hvead+?F;%fIO!nq8u(rM6~SxFyW
z=yi2q++0K^T5#ZDK+X-)M#pdm?;|jxFb`#d-*ACwWeILr0{JBTpB53VYPxsW#ul@i
zYqn*Tr~R!ux4Oo3$O=0*AqQ_Bk*eui
ztuC`1O?IoU1YMV}kPCjR$x{bF5fufHA$}LYeD?NybD?ra33&`16n(`{{yA=?dm#%&
z%CTzsieM}Fogt^h{t@7fQ7DDPoa+$5Ad6&xEF)l`Ng|6PugxuI*%sqGGAW>uh#DziWszO=jal<6`Rw7Fd+JYe|p|$YXGuA^3xF*;43kd-*)~2
zK58r><{uuHn+NYGpD)jI=N#=%(g_soSKVvjm7|@p!K5g#9*`j?!Q{_A3=@TOUi$lE
z_g;~zb&xxV``f8W48==6WMAB=u{p^M->(%|IOnY2wK;d-drNn5V%@`QFUQI&-@j>-
z!4drl&TENGzk#hN(t)bF>Rf5u7x8iwV~RL;uA=F@z{_v0uGls>yVBk%LH?LDBfi$y
z?=&Cee|R!+FU-;LHdNn@jk(wPdU<~P?R6C^_Vo&)B*LLnT4D1bj2_vzvOyktVGWIK
zAcoA<5gJxR!m<8dN7UiY1=Yp(QQojg-YV6?sKP*ie-`8Rr)q+-YvB0G6Ycw>mvg<7
z{rpWPY-EzxANJ1A1RD80)vX2U?1=eforhXH)UA7fnr-`RQXFDK&DZoM
zx?w=PZ>G~dX>3E|f#fS0MPIa~sZ{yaR*TrNkBVH_)x1phs(#Th%6hCMB~}JyJrGB%
zt1Quk@{WfufO>U|40hg=_o~%%uPg|?Gq&Kf+4UFPsncKly6v~2ojPKrWw7%VOuWxB
zE_aaKvi%4@ulaHz;-W~<&JT&nkr8-3Sbu@|K(YpDnwxm>laggc8>F3_B%kDUUxx+y
zv)}OMYW%zxPA7{_tjQjvCTJWW#R=?cUpQCNl@(R!Vve}1ZXw63teCB
zHEDW!eb)DH>!vweRt_Gx9$Tk5;=U0$6~9Z9>fIXu4MQ;L<2Qd%t>Gv)6VlgHNnHa;
z3_}x8z6nJ3x;2s%>#WZbx)YuJ>L+t3K?>)3hJq(ejW5GVmD3_r`Zl@$qS7_ApH-}u
zBNOo0rhNLDkQgDP=1$TN1C9rMhQsB#--A{c{l&1TvmKPrEo)|PG{FI6{d$O_=!gPu
zj0cDKdfChPg7xZky`A}rbobeWHx~CcZ#PWHB%q$}>T(
z{Pg7@Q>gEK|HS&>x}QMT>zpii!|UAR6YQU}r0p(|VAS~-qwT7?zj>)v@pS&Tb$om-
zRfB+Rch(h>sI(iLz+av%<~K9jHg>Bq1T_2#@x_W7Ep%M(4rcXDqy|BeK@i~A{zf*(
z(bNG74S@W-h`_yHq2K2Lgj~rJHs8-NosSQHAOe1$8|Y;X{-%9c-On`0@lv{c8ASY&
zORneCfy4}wj0mN+A^3~?lN@P_Iu0e@@}KLi=5i7am(j9)n_w`p38@fI$fKfz%r-~=
zHfQvCBvU}&4LR{
zp}zK^CCg=)UDK~ji=zrZA}T{i^uDs2?@%jT^TLAyHC!!E(qjFtbF-94UF5Xo
ztU4io0jwGD0JI5&#`s7k`uN{o_8(LTN6-k)-TmfBG_ulz6H-q)g#e7sRA;CRQ6Keebr067nN8&H{vYVK&Y)E(n64ZU~BF%t%rD
z!rtSzW{oE**Ju{#ew5-B`Wa=-XQi3eZtbre`9*!8y0*aE!aX|A!jnS_ZpL-Tv1j|y`LLn%QEWJ}0V
zCi2HewU_x`hjmNahad(t)D`)r4hRvE%4=C%rjhzYNX<<;kp_a`5DAueXcR|=W}A2%
ziun=2fUfX(ftSxw4Nty?X
zI2u+zi_&ODs{UOJ(lC2h?p*DAz}HwBDj9%ByzspBY)L~{Ygz3w8&7a0tx&z}wW|zL
z!W;(;r`7a5oC_p>j-GjBe-i|Ax#k{D6@~c)#VB~*NCN44VHfAF%js?9#q<7^_&5(S
znj$AxZDOh9Zgj9TcaBBdAUtPTh2+J07#b{idx84atsRJBTktsp=NtTZ1mA=kjHr?U
zSbiXo-0{U9V=ovm8NlI304xdp+`^@{;&8>&10jU0ZJYC&mF6O-W|et1_y1
zfF?|b`Qt-ZI=*#)j#ZZ#U64LY1q$uCB+)0FG#x|mE#cqQNspNi9+rw7dd7+mEe0{e
zN3j9`P-hMT=n;qnwuTjo#IE_TxdgRj=OO)Xv*Yid{TnasAx``bDFk{0WIK`b(poQE2
zxpU^+b6@t$+WYtL&8#)EzMbhXVe?4YPcHAX7vSWm))!)?4;;fX`ybFFLG5XYbcADq8b(0=AvfW-0jtyceA*-7pBM_}__JTG
z)}NEUA2D~y3=ys-mJ*_&RDs#VZmx#17sh!}gM4DHp^t9%6@KG(QqZcOJt@S9gDjDP
za}Ev4^f3X{Th8TrBEwkBBlJdt(q^wLf;n~ix(v&;d)f81P;!hHGN_DPLJQhwN+HX+5YD;E!RPg7ffw$9Ta`8M)=<7&
z_)heOv45#Wvzs!|xXX6A@Tl4g@i=)*^bqYU>L>3`m@P{eS1FtJ=ciI1vyWkNNKv~Q
z70zT(&f>x(XC&M>2L4*c@O7!fqFB_u}zg~3L~m~fj?XE_mqP#W&?c0BGb(l>Q#kuFWl|TOwCEww7whr
z!E2C?8Csb?H5aX=*dKQmg2cMe2H(B}i$)(Wuk5f|}qgC=I+wy#k_tb&K
zl@h7E8>#HETRaTL7jHB+aZ#^Jw3UKJige>xo2U}pMLDJt|GGN_spRH7m$pGis~K5x
zHS8rjmAuh)Ke%CwEuU+q;;9e6FAwHazD4_Q)^()CRZM?b-}}w!~y&t%=wQ-nVKRDzLCGmrEN-Rx$mdSM+l`nP=<^u7IE*>ij$ZbK5Ed5mZG>
z=Q=$+rD$my-J(^qQ_qWz8Vh9PW5@Z0aDCbrOqRWst(~KS3WOlEZYosBD+e{?mnjRGSiBX9bQ8jg*nV>}AKM+X4tiC|m=
zAc&!n=PDc++|73<<#*!>UBb|LQ__zc^g{LWp-9cYwZUyVSk(mU$-G=MnS0S+~3M1P_M5^%=US-~&
zhpq1Cd)w}Ey>B6gAJ7>q1GG!Wm*EaRP{@6UMoVSN?Z@vGSQ&RKDUG4s`<7-Z*Gp$p
zZ%of@U~X5mZg`$2!e`F>Md?ioy3m;c|I9Ll#fPp#UEsr$q~`oDK8K9%9bZJ8_exr&
zV?d&35mvOc!L8uNJnYL=zHvBl3oNPZF4>P2s_dGWb4Neyb+=-}MGj%=(6F@gf>a)n
zlj{Oy+e#*?Ncp0>cy4r#u$gazE+o#?LPg&{lv(e3Un*?Oo)$t4?uV54n#lm}F9&NA
zR@!E4*(vU=+`2c+Pke9XjpLJwC&ns`m$O6snRs3Tph(TP3+mVy@A#87
z_Uj#l6AA?%czV>tK7}&q^(rgrz33r@X11lf%&d(~w#~GUQVtgNPmD-3UlfftZKOI}
z=>m^))k67WX!r3lZT&mhcDG=H_k1>t&|l@*J(yA*_8rOj6Hgz#O1hi%AS=y(Lhti=
z=N&M@d%f7=)e3>u5rlGO@m6owxl;bf`=J`!$SvGe_jUr_D!_ZLDo7A;xcdVSeI+1!L&#hY
zN0-Mww_sqCM#qKBA8CXUm~pC&iCH8Dp=6hzv&bv{P3(_CAXli^`j9hJ~`2R
zRR(v-(TO3M%^%@%t@6}326!R;VI7$kw^&%FfRub_CjeBh)uWOII13fUn@pXW!!fKG
zHP@Kp_kF&h_r;RP+sf$JQ9^kO@TlbKX%itvq*NOHm}V_+oYpFVfQQ@@BOrvmfk@?*
zY=3Y&Bwg{v7*ZlQd!aw_%O3NZsE9s~_*Q`vy2!|{-Et@IpoONCwU*?+In_S|iMu#d
zZ0)U#q%V~B+x;0H-oCtwnyS0J`*BRYwKI9zzx8k?bo0mO_WJQUwmQ$?@mMTrV_(bijSFy>t}m
zw<%IvFHhNq3gw0yLSaj|HS;lO-h^M~aK&(}sZ0p|POAu7D7Bhlw7*ToR6ZTyBkd3s
z(5+|)$)~=b!>=C+Dr}wBwnc-*t(a!KLoXBZ3$d+8kbv1B2XKK_aIw$7V#bU-IPZ8Ax;oH8jaJ-M=1!?53MbOm6
zRclOvj~Xvc0*>CN@6a^MZOT+o<}6j;XS8>@B(xC@C`hP!uQAhuR;S=>7zMt@j2at8
zwb77h3QSeVCK@wAlkHd%220Z%5vzK08P-7&h?}LdmA&#nR_97S%_Hy+x1-rK%gupgPuPt^rXCYk|{WGYhx&G(6
z8hlop#4f~`Zdc{H6^X6+btz+*yN>Zmp%;=>q9JnZ!^bl{{X)TX>@z`qom$)zARX!o
zjh+AC1~*i`c5fC_0kM(%Y@OzUx8=UcOsrQtLw5@_q>K#Q+r^u)v`K+>gq0NK9C)`I
zX&RHTPcpF^s<`E;*|`U^PY2KRw4^-+2Qws^6jn}k*R->hkS`|ho%jb*nfk7{^FcT!
z+8*VK^xwBo0KZP67*EBzo=fK%qdfEe(*5?lEWVi(6-f2_*zXT@rq5{D%`XHdP9lwf
zB-p{`a}ph{q#Vxs8zpO^cuI#exo}PS$3fsvn}muB
zG5&mcZd8E^z5x)l@-3#%w}s;CnSMl1%x{tWP2EIDW`&NW^L?@OEhYeP;s^Uc4T4ZE
zyRIr+biRJ>Ww>%2Z`@Oj1`AJN7AtEpN#w0FEr$#YH*zb&C1H1gEk#tvd8(aOsgYhVAU+>||ouQ3ZYo_5oXIQ_H6ASNOih9HGCH}8o(Df>1(mIZ
zVw<{#+(TaUDv!oSA)|{0q#~Dl#3%}WQXmHJ;zGFyhw8q1`crAuM^Sg&L`i1N0L;~6zOFL%sUmG!i2dkOC6cuhsjBSh
z_5cBIG%vQ3LFz)<MdweJYDpZayLK`c>n=+QIzzy?2{Om(h*8tyNe@)SG-3CF7){miXgx4uSQFb=B8
z@Tf^ztRjw1;$$b;R$db5dXUreBf`GhE2v5*G>NFX=zOvibO6XAQR>*0bmLe;FzQv_
z$OoZOOI0#ke;dp!I8_CV(+K_^k8*Xm0RO&6B5q+Dn^>9yLF&4lQ4;6VlrH-Gs~F9;
za&42IHT&AIL|+V};F3!-^lawpSA<&Aa40k&`IdZ6`Gucdj!01qj3(<2cR1E(2}fge
za!GiqPW2w2cUt+Hs|S%X@!ox?BvgRRx4uquz$Rqbuc+m6_+r8ML!jR;{o*$1GBeCS
zFS
zVpU5HTeqz$gek8D>nWH7X9_m(h<=rmr{{iCrQ(b7U{w~Sq{B{Fl269NKs(@u=pN6+
zF->QBYV^;q*&S5yOi4}N8JB-0@Im@Wk<2(-V6M2Q3n>c#7X)DQGTk$u^9bY#bF354
zQ=2J;_k~!01t`5W_m5i7`?CDQ?v;d`tZ<0C0q_S-r{(=lWXzS~VLV%Pj&~|2p3zMp
zMLY%#k-@yQ=2?ed{r&H)DzW_TfCoxWjY$#1@S;IefzRDxSPw3mWafsI+uz=Vu8}~P
zt>tH=d?B_}deR9f-Erdw7p+wT^Em6Xa;eP$#GCvd6a0v|k>v#2gO3+)^UpeieZ&+{
zc66DSn9^ceLjZEOP8^nFBv6$M_{Y3`O`o$&jEwfo0okXnJ!S&6?}j5xpU?2B>ULiP
z$!)5v7o8$*&ldGb|_ZrCKxZ
zzHDv!IXQHm*vK-(GAVcnDqL)X!OtkBx^*bhSNz&~&~^{37q!1==wNEMoq$3+1nZ9GZ^sWwvMiPZjJ=k0J4PQa<|BcCaayN&V!KRO$7?Rb{)4vKZHC
ziJy@wX=fh1Zd-g)Olc7#`mg+EUa__-!BAV8_nb+R7+pjfw#=2d_2{_SV}@yb#=glt
z>{zJq5e(oLk_S@1pevc|nNB7z
z$N^i@0*HY&rzD7j`U-I)K5kHDt1qBPZi?v6V}7zuKvF4EMK2l$<_U@Oy$Is9Nb%WL
zlh-$_C}+rRT~ZY5Tnq3%y+I~@0ZAmBc5e*6+nA7qSFi|Ik=vSy|7o*;ZRX^rFBJ@D
z5Qt9G`v+K9m-Cm7^klGy@<7`dD4n-;owpt7ygO+=Ah%ritmJV@g!v-g9tAK1t>4GW
z>CUb5AcNl(ftfD@vj#C39TSUmuL_T2z|y&H=iX<(b2y4sDg#YQuvX~ckhG&b-Mhx}
zKs@Ku3I>r^ZXKFP_(~
z`@8s8aoIPkRGleS^$fe2@T&}b%tlMGh#9$Q4)n88PuE%GaDI21QEhG|w+r!E#X;nz
z`{_Tqsy1ZG3=EAaBmQGZ5WU43RTK={<{PM*94~d!gyI1HK%jC)3ABdmI(Wcw+f-`v
zcrQkBP09Aq3Ps@Jlj6#L{~)}p4P9}jxB<(5Lm{+bkmp3^wvkt
zpoYYC&wEp4a8iYWo2lBA!LTpbh>obxx1YH6J+KCv4&FQY-*S}V{wh_xcqc{*iwtqzp9dc9oss`cyB93?*HgZ_+_h0
zmVk2~de>$|p561ke@n3kn&IE73vx3G*YQBdbyEl%_j+|g9Q<}66YHAWY*$z(d%y_e
z)VY8Ig1%MOxR3ID%UkMRqOUaXGI_89VDL>hZT==ghbDr#3XBtTf;P7sLo4tomCowpa!Ys
z?%&T4PoGO8o9`swBH5PZcR_TCqq^~}IbJhSsG5g#pOEzz>f1x@TD`HjPzh-D2@`XAl_33^
zBfVc`s`kz{NN^{e?aGBML!H=@mBsyr7C0EDAuz@^!{3-)0kE62E=fnE1
z9MZ$)N^|YW)4nm0NX^Zm2^N|CW4*PExmyoe
zrQ{_Dk5;JUxRGmaFiRl^ZOfwh^IDJ_KpKFG4k!+o4~y13dW|qD9D6{IBBc0cr0;C)
z4n6
zRf4j1RLl7gp`fH5Td0qKdROb?txF4+M(CjDuRe*vf^%n6EBnE4dUE>CD9{MeFROxg
zS$r;ZP0~b!yZse!!g0qhXw)$Ttc)cinfq9U7QXu-Yj>DO7gh=>QcPhX127U^gODJ<
zW5+&7hzmH~pPX)|HmBhvx4#LEEV1aE$;nLgj7&4~c&?K}P|(*%x6h7_
zQ9jzB-EWx3*!pB$L;mRrtiP%m03#
Date: Wed, 19 Oct 2022 12:01:17 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E7=BB=8F?=
=?UTF-8?q?=E9=94=80=E5=95=86=20=E5=92=8C=E4=B8=AD=E4=BB=8B=E4=BA=BA?=
=?UTF-8?q?=E5=91=98=E6=B7=BB=E5=8A=A0=E6=9C=BA=E6=9E=84sid=E4=BB=A5?=
=?UTF-8?q?=E5=8F=8A=E7=94=A8=E6=88=B7sid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../app/BaseDistributorsListQuery.java | 3 ++
.../app/BaseDistributorsQuery.java | 3 ++
.../api/basedistributor/app/BaseInfoDto.java | 8 ++++
.../basedistributor/BaseDistributorMapper.xml | 2 +-
.../BaseDistributorService.java | 39 ++++++++++++++++---
.../distributor/DisBaseInfoDto.java | 5 +++
.../distributor/DistributorQuery.java | 3 ++
7 files changed, 56 insertions(+), 7 deletions(-)
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistributorsListQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistributorsListQuery.java
index f81e5b7bbc..9b76d3d5cb 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistributorsListQuery.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistributorsListQuery.java
@@ -17,4 +17,7 @@ public class BaseDistributorsListQuery implements Query {
@ApiModelProperty(value = "用户sid")
private String userSid;
+
+ @ApiModelProperty("机构sid")
+ private String orgPath;
}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistributorsQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistributorsQuery.java
index bae9dad06c..da4857b0d7 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistributorsQuery.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistributorsQuery.java
@@ -17,5 +17,8 @@ public class BaseDistributorsQuery implements Query {
@ApiModelProperty(value = "用户sid")
private String userSid;
+ @ApiModelProperty("机构sid")
+ private String orgPath;
+
}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseInfoDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseInfoDto.java
index 4ad5674eb0..8e3a06055a 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseInfoDto.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseInfoDto.java
@@ -4,6 +4,8 @@ import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotBlank;
+
/**
* @Author dimengzhe
* @Date 2022/7/15 10:37
@@ -69,4 +71,10 @@ public class BaseInfoDto implements Dto {
@ApiModelProperty(value = "经销商sid")
private String distributorSid;
+
+ @ApiModelProperty("用户sid")
+ @NotBlank(message = "用户sid不能为空")
+ private String userSid;
+ @ApiModelProperty("机构sid")
+ private String orgPath;
}
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml
index 0532174017..ad13ce954a 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml
@@ -122,7 +122,7 @@
case bd.state
when 1 then '未备案'
when 2 then '已备案' end as state,
- bd.pDistributorName,
+ if(length(bd.pDistributorName)>0,bd.pDistributorName,'无') as pDistributorName,
bd.registNum,
bd.registDetailAddress,
bd.invoPhone,
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java
index 73d932ea70..6bae0dd611 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java
@@ -14,6 +14,8 @@ import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaffVo;
import com.yxt.anrui.base.api.basemiddleman.BaseMiddleman;
import com.yxt.anrui.base.biz.basedistributorappendix.BaseDistributorAppendixService;
import com.yxt.anrui.base.biz.basedistributorstaff.BaseDistributorStaffService;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.common.base.config.component.FileUploadComponent;
@@ -59,6 +61,8 @@ public class BaseDistributorService extends MybatisBaseService resultBean = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid());
- qw.eq("useOrg", resultBean.getData());
+ if (StringUtils.isNotBlank(params.getOrgPath())) {
+ qw.eq("useOrg", params.getOrgPath());
+ } else {
+ if (StringUtils.isNotBlank(params.getUserSid())) {
+ ResultBean resultBean = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid());
+ qw.eq("useOrg", resultBean.getData());
+ }
}
}
IPage pagging = baseMapper.getDistributorList(page, qw);
@@ -527,9 +535,13 @@ public class BaseDistributorService extends MybatisBaseService qw = new QueryWrapper<>();
if (params != null) {
- if (StringUtils.isNotBlank(params.getUserSid())) {
- ResultBean resultBean = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid());
- qw.eq("bd.useOrg", resultBean.getData());
+ if (StringUtils.isNotBlank(params.getOrgPath())) {
+ qw.eq("bd.useOrg", params.getOrgPath());
+ } else {
+ if (StringUtils.isNotBlank(params.getUserSid())) {
+ ResultBean resultBean = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid());
+ qw.eq("bd.useOrg", resultBean.getData());
+ }
}
if (StringUtils.isNotBlank(params.getName())) {
qw.like("bd.disName", params.getName());
@@ -664,9 +676,24 @@ public class BaseDistributorService extends MybatisBaseService saveDistributorBaseInfo(BaseInfoDto dto) {
ResultBean rb = ResultBean.fireFail();
String sid = dto.getDistributorSid();
+ String userSid = dto.getUserSid();
+ String orgPath = dto.getOrgPath();
if (StringUtils.isBlank(sid)) {
BaseDistributor baseDistributor = new BaseDistributor();
BeanUtil.copyProperties(dto, baseDistributor, "sid");
+ baseDistributor.setCreateBySid(userSid);
+ if (StringUtils.isBlank(orgPath)) {
+ orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+ }
+ //查询机构信息
+ ResultBean resultBean = sysOrganizationFeign.fetchBySid(orgPath);
+ if (resultBean.getSuccess()) {
+ SysOrganizationVo sysOrganizationVo = resultBean.getData();
+ baseDistributor.setCreateOrgName(sysOrganizationVo.getName());
+ baseDistributor.setUseOrgName(sysOrganizationVo.getName());
+ }
+ baseDistributor.setCreateOrg(orgPath);
+ baseDistributor.setUseOrg(orgPath);
baseMapper.insert(baseDistributor);
sid = baseDistributor.getSid();
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisBaseInfoDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisBaseInfoDto.java
index d6154a9c51..98eaaf8adc 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisBaseInfoDto.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisBaseInfoDto.java
@@ -77,4 +77,9 @@ public class DisBaseInfoDto implements Dto {
@ApiModelProperty(value = "经销商sid")
private String distributorSid;
+
+ @ApiModelProperty("用户sid")
+ private String userSid;
+ @ApiModelProperty("机构sid")
+ private String orgPath;
}
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorQuery.java
index c9b9ab7bd7..faad60ff2d 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorQuery.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorQuery.java
@@ -16,4 +16,7 @@ public class DistributorQuery implements Query {
private String userSid;
@ApiModelProperty(value = "名称")
private String name;
+
+ @ApiModelProperty("机构sid")
+ private String orgPath;
}
From 8123957ecd70b64f1576da5091f9c6bce91db7a6 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Wed, 19 Oct 2022 12:03:53 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=AD=98?=
=?UTF-8?q?=E6=94=BE=E5=9C=B0=E7=82=B9=E5=8F=98=E6=9B=B4=E4=BF=9D=E5=AD=98?=
=?UTF-8?q?=E3=80=81=E7=BC=96=E8=BE=91=E3=80=81=E5=88=86=E9=A1=B5=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E3=80=81=E8=AF=A6=E6=83=85=E3=80=81?=
=?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=B7=BB=E5=8A=A0=E6=9C=BA=E6=9E=84?=
=?UTF-8?q?sid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../AppScmVehicleGressionDetailsVo.java | 2 +
.../AppScmVehicleGressionDto.java | 22 +----------
.../AppScmVehicleGressionInfoVo.java | 12 +-----
.../AppScmVehicleGressionPageQuery.java | 6 ++-
.../ScmVehicleGressionFeign.java | 2 +-
.../ScmVehicleGressionRest.java | 6 +--
.../ScmVehicleGressionService.java | 38 +++++++++++--------
.../AppBusAdvanceGinvoiceapplyFeign.java | 4 --
.../AppExaminePageQuery.java | 5 ++-
.../AppGressionDetailsVo.java | 3 ++
.../scmvehiclegression/AppGressionDto.java | 36 ++----------------
.../scmvehiclegression/AppGressionInfoVo.java | 4 ++
.../AppGressionPageQuery.java | 12 ++++--
.../AppScmVehicleGressionFeign.java | 4 +-
14 files changed, 62 insertions(+), 94 deletions(-)
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDetailsVo.java
index 0698099b28..15feab15e4 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDetailsVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDetailsVo.java
@@ -127,5 +127,7 @@ public class AppScmVehicleGressionDetailsVo implements Vo {
@ApiModelProperty("车架号")
private List scmVehicleGressionVehs;
+ @ApiModelProperty("组织机构sid")
+ private String useOrgSid;
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDto.java
index 0314848f00..93642ad79d 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDto.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDto.java
@@ -94,26 +94,8 @@ public class AppScmVehicleGressionDto implements Dto {
private String locationCode;
@ApiModelProperty("车架号")
private List scmVehicleGressionVehs;
- // @ApiModelProperty("车辆sid")
-// private String vehicleSid;
-// @ApiModelProperty("车架号")
-// private String vinNo;
-// @ApiModelProperty("车架号")
-// private List vins;
- /* @ApiModelProperty("申请编号")
- private String applicantNo;*/
- // @ApiModelProperty("申请人")
-// private String applicantName;
-// @ApiModelProperty("申请日期")
-// private String applicantDate;
-/* @ApiModelProperty("现存放地点")
- private String locationKey;*/
- /* @ApiModelProperty("目标库")
- private String targetLocationKey;*/
-// @ApiModelProperty("临牌")
-// private String temporaryCard;
-// @ApiModelProperty("保单照片")
-// private List policyImage;
+ @ApiModelProperty("机构sid")
+ private String orgPath;
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionInfoVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionInfoVo.java
index 7240b1d090..f260b46e4c 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionInfoVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionInfoVo.java
@@ -110,16 +110,8 @@ public class AppScmVehicleGressionInfoVo implements Vo {
private List scmVehicleGressionVehs = new ArrayList<>();
private String createBySid;
- /* @ApiModelProperty("车辆sid")
- private String vehicleSid;
- @ApiModelProperty("车架号")
- private String vinNo;*/
-
-/* @ApiModelProperty("现存地点")
- private String locationKey;*/
-
- /* @ApiModelProperty("目标地点")
- private String targetLocationKey;*/
+ @ApiModelProperty("机构sid")
+ private String useOrgSid;
}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionPageQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionPageQuery.java
index 3e4bc5f6cf..452a053c44 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionPageQuery.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionPageQuery.java
@@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotBlank;
+
/**
* Project: scm(scm)
* File: ScmVehicleGressionQuery.java
@@ -48,7 +50,9 @@ import lombok.Data;
@ApiModel(value = "移位单 查询条件", description = "移位单 查询条件")
public class AppScmVehicleGressionPageQuery implements Query {
+ private static final long serialVersionUID = 8190967049215312840L;
@ApiModelProperty("用户sid")
+ @NotBlank(message = "用户sid不能为空")
private String userSid;
@ApiModelProperty(" 先 申请单编号 后 车架号 ")
@@ -58,6 +62,6 @@ public class AppScmVehicleGressionPageQuery implements Query {
private String type;
@ApiModelProperty("分公司sid")
- private String useOrgSid;
+ private String orgPath;
}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java
index 6e630ba214..a43bfc7c75 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java
@@ -99,7 +99,7 @@ public interface ScmVehicleGressionFeign {
@ApiOperation("手机端-获取车辆移位列表")
@PostMapping("/getCarTransferList")
@ResponseBody
- public ResultBean> getCarTransferList(@RequestBody PagerQuery pagerQuery);
+ public ResultBean> getCarTransferList(@Valid @RequestBody PagerQuery pagerQuery);
@ApiOperation("移动端、PC端-保存车库移库信息")
@PostMapping("/saveCarTransferInfo")
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java
index 50c4ccd899..adc96e721b 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java
@@ -151,13 +151,11 @@ public class ScmVehicleGressionRest implements ScmVehicleGressionFeign {
@ApiOperation("手机端-获取车辆移位列表")
@PostMapping("/getCarTransferList")
public ResultBean> getCarTransferList(PagerQuery pagerQuery) {
- if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) {
- new ResultBean<>().success().setMsg("用户sid不能为空");
- }
+ ResultBean> rb = ResultBean.fireFail();
PagerVo page = new PagerVo<>();
IPage iPage = scmVehicleGressionService.getCarTransferList(pagerQuery);
PagerVo pagerVo = PagerUtil.pageToVo(iPage, page);
- return new ResultBean>().success().setData(pagerVo);
+ return rb.success().setData(pagerVo);
}
@Override
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 457e22ef33..6942642da3 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
@@ -323,18 +323,15 @@ public class ScmVehicleGressionService extends MybatisBaseService getCarTransferList(PagerQuery pagerQuery) {
String type = "05";
IPage page = PagerUtil.queryToPage(pagerQuery);
- String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
- pagerQuery.getParams().setUseOrgSid(useOrgSid);
+ /*String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
+ pagerQuery.getParams().setUseOrgSid(useOrgSid);*/
QueryWrapper qw = appQueryWrapper(pagerQuery.getParams());
AppScmVehicleGressionPageQuery params = pagerQuery.getParams();
IPage iPage = baseMapper.getCarTransferList(page, qw, params.getNames());
List records = iPage.getRecords();
for (AppScmVehicleGressionPageVo record : records) {
-
List scmVehicleGressionVehVos = scmVehicleGressionVehService.selectInfoVoByMainSid(record.getSid());
-
record.setScmVehicleGressionVehs(scmVehicleGressionVehVos);
-
if ("已办结".equals(record.getState())) {
record.setShowDownloadBtn(true);
//查询出门证
@@ -368,6 +365,9 @@ public class ScmVehicleGressionService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(userSid);
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
SysUserVo sysUserVo = userVoResultBean.getData();
- //获取分公司
- String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
//获取当天日期
String today = DateUtil.today();
- if (StringUtils.isBlank(sid)) {
+ if (StringUtils.isBlank(sid)) {//新增
ScmVehicleGression scmVehicleGression = new ScmVehicleGression();
BeanUtil.copyProperties(dto, scmVehicleGression, "sid");
- scmVehicleGression.setApplicantName(sysUserVo.getName());//申请人
- scmVehicleGression.setApplicantDate(today);//申请时间
- scmVehicleGression.setUseOrgSid(useOrgSid);//分公司sid
- scmVehicleGression.setCreateBySid(dto.getUserSid());
+ //申请人
+ scmVehicleGression.setApplicantName(sysUserVo.getName());
+ //申请时间
+ scmVehicleGression.setApplicantDate(today);
+ //分公司sid
+ scmVehicleGression.setUseOrgSid(useOrgSid);
+ scmVehicleGression.setCreateBySid(userSid);
+ //1待办 2已办
scmVehicleGression.setHandleState("1");
- String billNo = getApplyCode(dto);//申请编号
+ //申请编号
+ String billNo = getApplyCode(dto);
scmVehicleGression.setApplicantNo(billNo);
int i = baseMapper.insert(scmVehicleGression);
sid = scmVehicleGression.getSid();
@@ -414,7 +422,7 @@ public class ScmVehicleGressionService extends MybatisBaseService scmVehicleGressionVehs;
-/* @ApiModelProperty("现存放地点")
- @JsonProperty("nowAddressKey")
- private String locationKey;*/
- /* @ApiModelProperty("目标库")
- @JsonProperty("targetAddressKey")
- private String targetLocationKey;*/
-// @ApiModelProperty("申请人名称")
-// @JsonProperty("applyNmae")
-// private String applicantName;
-//
-// @ApiModelProperty("申请日期")
-// @JsonProperty("applyDate")
-// private String applicantDate;
-
-// @ApiModelProperty("车架号")
-// @JsonProperty("vin")
-// private String vinNo;
-//
-// @ApiModelProperty("车架号")
-// private List vins;
-
-
-// @ApiModelProperty("保单照片")
-// @JsonProperty("policyImage")
-// private List policyImage;
-
-
-// @ApiModelProperty("临牌")
-// @JsonProperty("proCard")
-// private String temporaryCard;
-//
-// @ApiModelProperty("现场照片")
-// private List image;
+ @ApiModelProperty("机构sid")
+ private String orgPath;
}
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java
index 5eec0227b5..ee459a1cfd 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java
@@ -112,5 +112,9 @@ public class AppGressionInfoVo implements Vo {
@JsonProperty("personSid")
private String personUserSid;
+ @ApiModelProperty("机构sid")
+ @JsonProperty("orgPath")
+ private String useOrgSid;
+
}
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionPageQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionPageQuery.java
index ad2eca77af..eb3dea7331 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionPageQuery.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionPageQuery.java
@@ -1,18 +1,24 @@
package com.yxt.anrui.terminal.api.supplychain.scmvehiclegression;
+import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotBlank;
+
@Data
public class AppGressionPageQuery implements Query {
+ private static final long serialVersionUID = 6179915096664858861L;
@ApiModelProperty("用户sid")
+ @NotBlank(message = "用户sid不能为空")
private String userSid;
-
@ApiModelProperty("")
private String names;
-
- @ApiModelProperty("")
+ @ApiModelProperty("1待办、2已办")
private String type;
+
+ @ApiModelProperty("机构sid")
+ private String orgPath;
}
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeign.java
index ea3a455363..b60112c0e8 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeign.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeign.java
@@ -38,6 +38,8 @@ import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
+import javax.validation.Valid;
+
/**
* Project: scm(scm)
* File: ScmVehicleGressionFeign.java
@@ -67,7 +69,7 @@ public interface AppScmVehicleGressionFeign {
@ApiOperation("手机端-保存车库移库信息")
@PostMapping("/saveCarTransferInfo")
@ResponseBody
- public ResultBean saveCarTransferInfo(@RequestBody AppGressionDto dto);
+ public ResultBean saveCarTransferInfo(@Valid @RequestBody AppGressionDto dto);
@ApiOperation("手机端-初始化移库申请")
@GetMapping("/getCarTransferInfo/{sid}/{userSid}")
From e6a2a816581df9b9d1a8cf5aa8dc5ff11ba85c86 Mon Sep 17 00:00:00 2001
From: hp <2969694837@qq.com>
Date: Wed, 19 Oct 2022 16:39:01 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=A1=AE=E8=AE=A4?=
=?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../commonappendix/CommonAppendixFeign.java | 5 +
.../CommonAppendixFeignFallback.java | 5 +
.../commonappendix/CommonAppendixMapper.java | 37 ++--
.../commonappendix/CommonAppendixRest.java | 7 +
.../commonappendix/CommonAppendixService.java | 5 +
.../AppFinCollectionConfirmationInitVo.java | 2 +-
.../FinCollectionConfirmationMapper.xml | 13 +-
.../FinCollectionConfirmationService.java | 190 +++++++++++++-----
.../FinSelectedReceivablesDetailedMapper.java | 4 +-
.../FinSelectedReceivablesDetailedMapper.xml | 20 +-
...FinSelectedReceivablesDetailedService.java | 8 +-
11 files changed, 211 insertions(+), 85 deletions(-)
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAppendixFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAppendixFeign.java
index e5a8bca9b6..6745df4be7 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAppendixFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAppendixFeign.java
@@ -145,4 +145,9 @@ public interface CommonAppendixFeign {
@ApiOperation("根据文件相对路径查询文件名称")
@PostMapping("/fetchByFilePath")
ResultBean fetchByFilePath(@RequestParam(value = "s") String s);
+
+ @ApiOperation(value = "根据业务sid和附件类型批量删除")
+ @PostMapping("/delFilesByLinkSidAndAttachType")
+ ResultBean delFilesByLinkSidAndAttachType(@RequestParam(value = "linkSid") String linkSid,@RequestParam(value = "attachType") String attachType);
+
}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAppendixFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAppendixFeignFallback.java
index 61f55d80cc..7f8d72a520 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAppendixFeignFallback.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAppendixFeignFallback.java
@@ -167,4 +167,9 @@ public class CommonAppendixFeignFallback implements CommonAppendixFeign {
public ResultBean fetchByFilePath(String s) {
return null;
}
+
+ @Override
+ public ResultBean delFilesByLinkSidAndAttachType(String linkSid, String attachType) {
+ return null;
+ }
}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixMapper.java
index 1fb4369550..367206e92d 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixMapper.java
@@ -30,23 +30,23 @@ import java.util.List;
@Mapper
public interface CommonAppendixMapper extends BaseMapper {
- //@Update("update common_appendix set name=#{msg} where id=#{id}")
- //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
-
- IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
-
- List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw);
-
- @Select("select * from common_appendix")
- List selectListVo();
+ //@Update("update common_appendix set name=#{msg} where id=#{id}")
+ //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
- List selectByLinkSid(@Param("linkSid") String linkSid, @Param("attachType") String attachType);
+ IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
- int deleteByLinkSid(@Param("linkSid") String linkSid, @Param("attachType") String attachType);
+ List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw);
- int selectPath(String path);
+ @Select("select * from common_appendix")
+ List selectListVo();
- int deletePath(String path);
+ List selectByLinkSid(@Param("linkSid") String linkSid, @Param("attachType") String attachType);
+
+ int deleteByLinkSid(@Param("linkSid") String linkSid, @Param("attachType") String attachType);
+
+ int selectPath(String path);
+
+ int deletePath(String path);
List getPcAppendix(@Param("type") String type, @Param("linkSid") String linkSid, @Param("path") String path);
@@ -60,10 +60,13 @@ public interface CommonAppendixMapper extends BaseMapper {
List selectPathByLinkSId(String linkSid);
- List selectGroupByLinkSidAndAttachType(@Param("linkSid") String linkSid, @Param("attachType") String attachType);
+ List selectGroupByLinkSidAndAttachType(@Param("linkSid") String linkSid, @Param("attachType") String attachType);
+
+ @Select("SELECT * FROM common_appendix WHERE filePath =#{s}")
+ CommonAppendixVo fetchByFilePath(String s);
- @Select("SELECT * FROM common_appendix WHERE filePath =#{s}")
- CommonAppendixVo fetchByFilePath(String s);
+ List selectByType(@Param("sid") String sid, @Param("attachType") String attachType, @Param("path") String path);
- List selectByType(@Param("sid") String sid, @Param("attachType") String attachType,@Param("path") String path);
+ @Delete("delete from common_appendix where linkSid = #{linkSid} and attachType = #{attachType} ")
+ int delFilesByLinkSidAndAttachType(@Param("linkSid") String linkSid, @Param("attachType") String attachType);
}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixRest.java
index 98e228cd7e..390cc48848 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixRest.java
@@ -247,4 +247,11 @@ public class CommonAppendixRest implements CommonAppendixFeign {
public ResultBean fetchByFilePath(String s) {
return commonAppendixService.fetchByFilePath(s);
}
+
+ @Override
+ public ResultBean delFilesByLinkSidAndAttachType(String linkSid, String attachType) {
+ ResultBean rb = ResultBean.fireFail();
+ int i = commonAppendixService.delFilesByLinkSidAndAttachType(linkSid,attachType);
+ return rb.success().setMsg("删除成功");
+ }
}
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixService.java
index d6a9b5f49e..455f1fd27f 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixService.java
@@ -489,4 +489,9 @@ public class CommonAppendixService extends MybatisBaseService selectByType(String sid, String attachType,String path) {
return baseMapper.selectByType(sid,attachType,path);
}
+
+ public int delFilesByLinkSidAndAttachType(String linkSid, String attachType) {
+ return baseMapper.delFilesByLinkSidAndAttachType(linkSid,attachType);
+
+ }
}
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationInitVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationInitVo.java
index 430399b904..5780fa6879 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationInitVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationInitVo.java
@@ -57,7 +57,7 @@ public class AppFinCollectionConfirmationInitVo implements Vo {
private List payFiles = new ArrayList<>();
@ApiModelProperty("款项明细")
- private List contractList = new ArrayList<>();
+ private List contractList = new ArrayList<>();
@ApiModelProperty("余额")
private String balance;
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml
index 192d6b026b..cf5e86f02a 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml
@@ -40,13 +40,16 @@
@@ -62,4 +59,19 @@
receivablesName
ORDER BY auditDate
+
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java
index 4247e1a6ec..e26c9aa7d4 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java
@@ -179,8 +179,8 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService getPaymentDetailsList(List sidList, IPage page, QueryWrapper qw) {
- return baseMapper.getPaymentDetailsList(sidList, page, qw);
+ public IPage getPaymentDetailsList(IPage page, QueryWrapper qw) {
+ return baseMapper.getPaymentDetailsList(page, qw);
}
public List fetchByAuditState(String sid,Integer auditState) {
@@ -202,4 +202,8 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService selectByCollSid(String collectionBillSid) {
+ return baseMapper.selectByCollSid(collectionBillSid);
+ }
}
\ No newline at end of file
From cae54d925af7fcef9d706b508bac4a2fbc21e9e5 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Wed, 19 Oct 2022 16:43:36 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E5=A4=96=E9=87=87-=E6=94=B6=E8=BD=A6-?=
=?UTF-8?q?=E6=8E=A8=E9=80=81=E8=BD=A6=E8=BE=86=E5=8F=B0=E8=B4=A6=E7=9A=84?=
=?UTF-8?q?=E5=93=81=E7=89=8C=E3=80=81=E9=87=87=E8=B4=AD=E7=B3=BB=E7=BB=9F?=
=?UTF-8?q?=E7=AD=89=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../BaseManufacturerFeign.java | 6 ++++
.../BaseManufacturerFeignFallback.java | 5 ++++
.../api/basemanufacturer/BaseOutManuVo.java | 21 +++++++++++++
.../BaseOutsourcingApplicationDetailsVo.java | 2 ++
.../BaseManufacturerMapper.java | 2 ++
.../BaseManufacturerMapper.xml | 9 +++++-
.../BaseManufacturerRest.java | 7 ++++-
.../BaseManufacturerService.java | 6 ++++
...pScmVehicleStayInventoryListPageQuery.java | 3 +-
.../ScmVehicleEnterlibraryService.java | 30 ++++++++++++++++++-
.../ScmVehicleInventoryService.java | 30 ++++++++-----------
.../AppScmVehicleInventoryFeign.java | 2 +-
.../inventory/InventoryListPageQuery.java | 5 ++--
.../AppScmVehicleGressionFeign.java | 6 ++--
.../AppScmVehicleGressionService.java | 6 ----
15 files changed, 107 insertions(+), 33 deletions(-)
create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseOutManuVo.java
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java
index 3c80ba9373..625b35db3d 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java
@@ -190,4 +190,10 @@ public interface BaseManufacturerFeign {
@GetMapping("/selectByOrgSidAndManBankSid/{useOrgSid}/{manufacturerSid}")
@ResponseBody
ResultBean selectByOrgSidAndManBankSid(@PathVariable("useOrgSid") String useOrgSid,@PathVariable("manufacturerSid") String manufacturerSid);
+
+ @ApiOperation("根据车型sid查询品牌、厂商等信息")
+ @GetMapping("/getManDetails/{modelSid}")
+ @ResponseBody
+ ResultBean getManDetails(@PathVariable("modelSid")String modelSid);
+
}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java
index 505866be1d..b8c8a8a9cd 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java
@@ -115,4 +115,9 @@ public class BaseManufacturerFeignFallback implements BaseManufacturerFeign {
public ResultBean selectByOrgSidAndManBankSid(String useOrgSid, String manufacturerSid) {
return null;
}
+
+ @Override
+ public ResultBean getManDetails(String modelSid) {
+ return null;
+ }
}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseOutManuVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseOutManuVo.java
new file mode 100644
index 0000000000..22836401ac
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseOutManuVo.java
@@ -0,0 +1,21 @@
+package com.yxt.anrui.base.api.basemanufacturer;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/10/19 16:28
+ * @Description
+ */
+@Data
+public class BaseOutManuVo implements Vo {
+ private static final long serialVersionUID = 1493324794029065913L;
+ @ApiModelProperty("品牌sid")
+ private String brandSid;
+ @ApiModelProperty("品牌名称")
+ private String brandName;
+ @ApiModelProperty("厂商sid")
+ private String manufacturerSid;
+}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java
index a50c061889..27061894c4 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java
@@ -126,4 +126,6 @@ public class BaseOutsourcingApplicationDetailsVo implements Vo {
private CommonAppendixVo contract; // 备注
@ApiModelProperty("外采车辆列表")
private List baseOutsourcingApplicationVehicleVos; // 外采车辆列表
+
+ private String createBySid;
}
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java
index 7a2e5235f0..f2738dc97c 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java
@@ -135,4 +135,6 @@ public interface BaseManufacturerMapper extends BaseMapper {
List selectByMank(@Param("mankSid") String s, @Param("type") String type, @Param("orgSid") String orgSid);
int updateMank(@Param("sid") String sid, @Param("name") String name, @Param("createName") String name1);
+
+ BaseOutManuVo getManDetails(String modelSid);
}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml
index df1323a4b5..21fd3c748d 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml
@@ -288,7 +288,7 @@
where createOrg = #{orgSid}
and manBankSid = #{mankSid}
and supplierTypeValue = #{type}
- AND isDelete = 0
+ AND isDelete = 0
@@ -298,4 +298,11 @@
manufacturerName = #{name}
where sid = #{sid}
+
+
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java
index d9a64a91b6..165aff7acc 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java
@@ -203,6 +203,11 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
@Override
public ResultBean selectByOrgSidAndManBankSid(String useOrgSid, String manufacturerSid) {
- return baseManufacturerService.selectByOrgSidAndManBankSid(useOrgSid,manufacturerSid);
+ return baseManufacturerService.selectByOrgSidAndManBankSid(useOrgSid, manufacturerSid);
+ }
+
+ @Override
+ public ResultBean getManDetails(String modelSid) {
+ return baseManufacturerService.getManDetails(modelSid);
}
}
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
index 0d14d0914b..2498f26d06 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
@@ -630,4 +630,10 @@ public class BaseManufacturerService extends MybatisBaseService getManDetails(String modelSid) {
+ ResultBean rb = ResultBean.fireFail();
+ BaseOutManuVo vo = baseMapper.getManDetails(modelSid);
+ return rb.success().setData(vo);
+ }
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryListPageQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryListPageQuery.java
index 9cb109b167..eda41e18af 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryListPageQuery.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryListPageQuery.java
@@ -7,6 +7,7 @@ import lombok.Data;
@Data
public class AppScmVehicleStayInventoryListPageQuery implements Query {
+ private static final long serialVersionUID = 5599273643899587257L;
@ApiModelProperty("用户sid")
private String userSid;
@@ -17,5 +18,5 @@ public class AppScmVehicleStayInventoryListPageQuery implements Query {
private String warehouseSid;
@ApiModelProperty("使用组织分公司sid")
- private String useOrgSid;
+ private String orgPath;
}
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 21729f65f6..7c55945046 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
@@ -32,6 +32,8 @@ import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseDetailsVo
import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseFeign;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleFeign;
+import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign;
+import com.yxt.anrui.base.api.basemanufacturer.BaseOutManuVo;
import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDetailsVo;
import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
@@ -46,6 +48,7 @@ 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.SysUserInfoVo;
import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
import com.yxt.anrui.scm.api.scmfile.ScmFile;
import com.yxt.anrui.scm.api.scmvehicleenterlibrary.*;
@@ -114,6 +117,8 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService createQueryWrapper(ScmVehicleEnterlibraryQuery query) {
// todo: 这里根据具体业务调整查询条件
@@ -357,7 +362,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(createBySid);
+ if (sysUserInfoVoResultBean.getSuccess()) {
+ SysUserInfoVo sysUserInfoVo = sysUserInfoVoResultBean.getData();
+ if (sysUserInfoVo != null) {
+ String orgDeptSid = sysUserInfoVo.getOrgSid();
+ //采购系统及sid
+ baseVehicleDto.setPurchaseSystemSid(orgDeptSid);
+ baseVehicleDto.setPurchaseSystemName(sysUserInfoVo.getOrgName());
+ }
+ }
+ //根据车型sid查询品牌及名称及厂商sid
+ ResultBean resultBeanBaseManu = baseManufacturerFeign.getManDetails(scmVehicleEnterlibrary.getModelSid());
+ baseVehicleDto.setSupplierSid(applicationDetailsVo.getPurchasingUnitSid());
+ if (resultBeanBaseManu.getData() != null) {
+ baseVehicleDto.setManufacturerSid(resultBeanBaseManu.getData().getManufacturerSid());
+ baseVehicleDto.setCarBrandSid(resultBeanBaseManu.getData().getBrandSid());
+ baseVehicleDto.setCarBrandName(resultBeanBaseManu.getData().getBrandName());
+ }
}
baseVehicleDto.setCreateOrgSid(scmVehicleEnterlibrary.getUseOrgSid());
baseVehicleDto.setCreateOrgName(scmVehicleEnterlibrary.getUseOrgName());
@@ -404,6 +431,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService list = new ArrayList<>();
list.add(baseVehicleDto);
baseVehicleFeign.saveOrUpdate(list, OperVehicleState.EventType.WC_SAVEVEH.getCode());
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java
index 5571196b22..9f9f5ec62c 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java
@@ -28,32 +28,25 @@ package com.yxt.anrui.scm.biz.scmvehicleinventory;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.itextpdf.text.pdf.PRAcroForm;
-import com.yxt.anrui.base.api.basevehicle.AppScmInventoryRecordsVo;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.scm.api.scmfile.ScmFile;
import com.yxt.anrui.scm.api.scmvehicleinventory.*;
-import com.yxt.anrui.scm.api.scmvehicleinventory.ScmVehicleStayInventoryQuery;
import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetDto;
-import com.yxt.anrui.scm.api.scmvehiclestayinventory.*;
-import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthVo;
+import com.yxt.anrui.scm.api.scmvehiclestayinventory.ScmVehicleStayInventoryVo;
import com.yxt.anrui.scm.api.scmvehinventorymonth.AppVehInventorymonthVo;
import com.yxt.anrui.scm.api.scmvehinventorymonth.AppVinAndRemarksVo;
import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
import com.yxt.anrui.scm.biz.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetService;
import com.yxt.anrui.scm.biz.scmvehiclestayinventory.ScmVehicleStayInventoryService;
import com.yxt.common.base.config.component.FileUploadComponent;
-import com.yxt.common.core.result.ResultBean;
-import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
-
-
-import org.apache.ibatis.annotations.Param;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -61,7 +54,6 @@ import org.springframework.transaction.annotation.Transactional;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -220,15 +212,19 @@ public class ScmVehicleInventoryService extends MybatisBaseService getInventoryList(PagerQuery pagerQuery) {
IPage page = PagerUtil.queryToPage(pagerQuery);
- String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
- pagerQuery.getParams().setUseOrgSid(useOrgSid);
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
QueryWrapper qw = new QueryWrapper<>();
+ AppScmVehicleStayInventoryListPageQuery query = pagerQuery.getParams();
+ String orgPath = query.getOrgPath();
+ String userSid = query.getUserSid();
+ if(StringUtils.isBlank(orgPath)){
+ orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+ }
+ if(StringUtils.isNotBlank(orgPath)){
+ qw.eq("createOrgSid", orgPath);
+ }
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
qw.eq("isDelete", 0);
qw.eq("InventoryState", "无");
- if (StringUtils.isNotBlank(pagerQuery.getParams().getUseOrgSid())) {
- qw.eq("createOrgSid", pagerQuery.getParams().getUseOrgSid());
- }
if (StringUtils.isNotBlank(pagerQuery.getParams().getWarehouseSid())) {
qw.eq("locationSid", pagerQuery.getParams().getWarehouseSid());
}
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeign.java
index 07ad82e6e4..40af9e69b6 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeign.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeign.java
@@ -48,7 +48,7 @@ import org.springframework.web.bind.annotation.*;
*/
@Api(tags = "盘库记录")
@FeignClient(
- contextId = "anrui-scm-ScmVehicleInventory",
+ contextId = "anrui-terminal-ScmVehicleInventory",
name = "anrui-terminal",
path = "/supplychain/v1/inventory",
fallback = AppScmVehicleInventoryFeignFallback.class)
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/InventoryListPageQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/InventoryListPageQuery.java
index 1e1d06fc3c..e3418b733c 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/InventoryListPageQuery.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/InventoryListPageQuery.java
@@ -7,13 +7,14 @@ import lombok.Data;
@Data
public class InventoryListPageQuery implements Query {
+ private static final long serialVersionUID = 5831697424231715724L;
@ApiModelProperty("用户sid")
private String userSid;
-
@ApiModelProperty("优先匹配车架号 盘库人员")
private String names;
-
@ApiModelProperty("存放地点 “”/null 全部 有值时只查询当前存放地点的记录")
private String warehouseSid;
+ @ApiModelProperty("机构sid")
+ private String orgPath;
}
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeign.java
index b60112c0e8..fb08f9c1af 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeign.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeign.java
@@ -61,17 +61,17 @@ import javax.validation.Valid;
fallback = AppScmVehicleGressionFeignFallback.class)
public interface AppScmVehicleGressionFeign {
- @ApiOperation("手机端-获取车辆移位列表")
+ @ApiOperation("手机端-获取车辆移位列表：已添加机构sid")
@PostMapping("/getCarTransferList")
@ResponseBody
public ResultBean> getCarTransferList(@RequestBody PagerQuery pagerQuery);
- @ApiOperation("手机端-保存车库移库信息")
+ @ApiOperation("手机端-保存车库移库信息：已添加机构sid")
@PostMapping("/saveCarTransferInfo")
@ResponseBody
public ResultBean saveCarTransferInfo(@Valid @RequestBody AppGressionDto dto);
- @ApiOperation("手机端-初始化移库申请")
+ @ApiOperation("手机端-初始化移库申请：已添加机构sid")
@GetMapping("/getCarTransferInfo/{sid}/{userSid}")
@ResponseBody
public ResultBean getCarTransferInfo(@PathVariable("sid") String sid, @PathVariable("userSid") String userSid);
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java
index 334165bd28..7702b252d6 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java
@@ -42,7 +42,6 @@ import com.yxt.anrui.terminal.config.CoverUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
-import org.apache.axis.i18n.RB;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -145,11 +144,6 @@ public class AppScmVehicleGressionService {
ResultBean rb = ResultBean.fireFail();
SubmitCarTransferDto submitCarTransferDto = new SubmitCarTransferDto();
BeanUtil.copyProperties(dto, submitCarTransferDto);
-// //根据车架号查询车辆sid
-// ResultBean stringResultBean = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo());
-// if (stringResultBean.getSuccess()) {
-// submitCarTransferDto.setVehicleSid(stringResultBean.getData().getSid());
-// }
ResultBean resultBean = scmVehicleGressionFeign.submitCarTransfer(submitCarTransferDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
From 3b95d2295521f9035caceb5c6113cc65d46d89f3 Mon Sep 17 00:00:00 2001
From: hp <2969694837@qq.com>
Date: Wed, 19 Oct 2022 17:09:04 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=A1=AE=E8=AE=A4?=
=?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../api/finance/collectionConfirm/ConfirmationInitVo.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationInitVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationInitVo.java
index 186e557021..8553c4ae89 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationInitVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationInitVo.java
@@ -58,7 +58,7 @@ public class ConfirmationInitVo implements Vo {
private List payFiles = new ArrayList<>() ;
@ApiModelProperty("款项明细")
- private List contractList = new ArrayList<>();
+ private List contractList = new ArrayList<>();
@ApiModelProperty("余额")
private String balance;
From 5f2bdaefb424e41cb2aa4cf2d81df47c3f6c4e3f Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Wed, 19 Oct 2022 18:30:41 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E8=B0=83=E8=BD=A6=E6=8E=A8=E9=80=81?=
=?UTF-8?q?=E9=87=91=E8=9D=B6=E5=87=BA=E5=BA=93=E5=8D=95=E5=92=8C=E5=85=A5?=
=?UTF-8?q?=E5=BA=93=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../BaseAccadjApplyToJDRu.java | 61 +++
.../BaseInternalPurchase.java | 8 +
.../BaseInternalPurchaseDetailsVo.java | 8 +
.../BaseInternalPurchaseDto.java | 8 +
.../BaseInternalPurchaseVehicle.java | 4 +
.../BaseInternalPurchaseVehicleDetailsVo.java | 4 +
.../BaseInternalPurchaseVehicleDto.java | 4 +
.../BaseInternalPurchaseVehicleVo.java | 4 +
.../BaseAccadjApplyService.java | 380 ++++++++++--------
.../BaseAccadjApplyeVehMapper.java | 4 +
.../BaseAccadjApplyeVehMapper.xml | 49 ++-
.../BaseAccadjApplyeVehService.java | 8 +
.../BaseInternalPurchaseService.java | 5 +
.../BaseInternalPurchaseVehicleMapper.java | 6 +
.../BaseInternalPurchaseVehicleMapper.xml | 78 ++--
.../BaseInternalPurchaseVehicleService.java | 9 +
.../BaseManufacturerMapper.xml | 12 +-
.../BaseManufacturerService.java | 7 +-
.../BaseManufacturerBankMapper.java | 2 +
.../BaseManufacturerBankMapper.xml | 31 +-
.../BaseManufacturerBankService.java | 4 +
.../BaseOutsourcingApplicationService.java | 4 +-
.../base/biz/basevehicle/BaseVehicleRest.java | 15 +-
.../biz/basevehicle/BaseVehicleService.java | 16 +-
.../anrui/flowable/api/utils/ProcDefEnum.java | 2 +-
.../sysorganization/SysOrganizationFeign.java | 10 +
.../SysOrganizationFeignFallback.java | 10 +
.../SysOrganizationMapper.java | 2 +
.../sysorganization/SysOrganizationMapper.xml | 7 +
.../sysorganization/SysOrganizationRest.java | 10 +
.../SysOrganizationService.java | 27 ++
.../ScmApplyInboundService.java | 14 +-
.../biz/scmwarehouse/ScmWarehouseMapper.java | 3 +
.../biz/scmwarehouse/ScmWarehouseService.java | 4 +
34 files changed, 577 insertions(+), 243 deletions(-)
create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyToJDRu.java
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyToJDRu.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyToJDRu.java
new file mode 100644
index 0000000000..77214120bc
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyToJDRu.java
@@ -0,0 +1,61 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseaccadjapply;
+
+
+import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(调账管理)
+ * File: BaseAccadjApplyVo.java
+ * Class: com.yxt.anrui.base.api.baseaccadjapply.BaseAccadjApplyVo
+ * Description: 调账申请表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-07-07 16:57:24
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "调账申请表 视图数据对象", description = "调账申请表 视图数据对象")
+public class BaseAccadjApplyToJDRu implements Vo {
+
+ @ApiModelProperty("采购部门sid")
+ private String callInBuyerOrgSid; // 采购部门sid
+ @ApiModelProperty("调车车辆列表")
+ private List baseInternalPurchaseVehicles;//调车车辆列表
+ @ApiModelProperty("车辆台账列表")
+ private List baseVehicles;//车辆台账列表
+}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchase.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchase.java
index 236fc6573c..836da9c17c 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchase.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchase.java
@@ -82,4 +82,12 @@ public class BaseInternalPurchase extends BaseEntity {
private String procInstId;
@ApiModelProperty("任务id")
private String taskId;
+ @ApiModelProperty("品牌sid")
+ private String brandSid; // 品牌sid
+ @ApiModelProperty("品牌名称")
+ private String brandName; // 品牌名称
+ @ApiModelProperty("调入方采购部门sid")
+ private String callInBuyerOrgSid; // 调入方采购部门sid
+ @ApiModelProperty("调入方采购部门名称")
+ private String callInBuyerOrgName; // 调入方采购部门名称
}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDetailsVo.java
index a28f185e0c..646e8432a8 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDetailsVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDetailsVo.java
@@ -94,6 +94,14 @@ public class BaseInternalPurchaseDetailsVo implements Vo {
private String procInstId;
@ApiModelProperty(value = "任务id")
private String taskId;
+ @ApiModelProperty("品牌sid")
+ private String brandSid; // 品牌sid
+ @ApiModelProperty("品牌名称")
+ private String brandName; // 品牌名称
+ @ApiModelProperty("调入方采购部门sid")
+ private String callInBuyerOrgSid; // 调入方采购部门sid
+ @ApiModelProperty("调入方采购部门名称")
+ private String callInBuyerOrgName; // 调入方采购部门名称
@ApiModelProperty("内购车辆列表")
private List baseInternalPurchaseVehicles; // 内购车辆列表
}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDto.java
index 780fd0a0a9..2f87ca1672 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDto.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDto.java
@@ -78,6 +78,14 @@ public class BaseInternalPurchaseDto implements Dto {
private String useOrgSid; // 使用组织sid
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
+ @ApiModelProperty("品牌sid")
+ private String brandSid; // 品牌sid
+ @ApiModelProperty("品牌名称")
+ private String brandName; // 品牌名称
+ @ApiModelProperty("调入方采购部门sid")
+ private String callInBuyerOrgSid; // 调入方采购部门sid
+ @ApiModelProperty("调入方采购部门名称")
+ private String callInBuyerOrgName; // 调入方采购部门名称
@ApiModelProperty("内购车辆列表")
private List baseInternalPurchaseVehicles; // 内购车辆列表
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicle.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicle.java
index 68c037dd74..bf869338e5 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicle.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicle.java
@@ -94,4 +94,8 @@ public class BaseInternalPurchaseVehicle extends BaseEntity {
private String recallStateValue; // 调回状态value
@ApiModelProperty("厂家结算价")
private BigDecimal costPrice; // 厂家结算价
+ @ApiModelProperty("调入方采购部门sid")
+ private String callInBuyerOrgSid; // 调入方采购部门sid
+ @ApiModelProperty("调入方采购部门名称")
+ private String callInBuyerOrgName; // 调入方采购部门名称
}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDetailsVo.java
index ffa1744068..da489ea246 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDetailsVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDetailsVo.java
@@ -109,4 +109,8 @@ public class BaseInternalPurchaseVehicleDetailsVo implements Vo {
private String recallStateValue; // 调回状态value
@ApiModelProperty("厂家结算价")
private BigDecimal costPrice; // 厂家结算价
+ @ApiModelProperty("调入方采购部门sid")
+ private String callInBuyerOrgSid; // 调入方采购部门sid
+ @ApiModelProperty("调入方采购部门名称")
+ private String callInBuyerOrgName; // 调入方采购部门名称
}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDto.java
index 99543240a4..fa8d6028b2 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDto.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDto.java
@@ -97,4 +97,8 @@ public class BaseInternalPurchaseVehicleDto implements Dto {
private String recallStateValue; // 调回状态value
@ApiModelProperty("厂家结算价")
private BigDecimal costPrice; // 厂家结算价
+ @ApiModelProperty("调入方采购部门sid")
+ private String callInBuyerOrgSid; // 调入方采购部门sid
+ @ApiModelProperty("调入方采购部门名称")
+ private String callInBuyerOrgName; // 调入方采购部门名称
}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleVo.java
index e23983728b..b29d451234 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleVo.java
@@ -99,4 +99,8 @@ public class BaseInternalPurchaseVehicleVo implements Vo {
private String recallStateValue; // 调回状态value
@ApiModelProperty("厂家结算价")
private BigDecimal costPrice; // 厂家结算价
+ @ApiModelProperty("调入方采购部门sid")
+ private String callInBuyerOrgSid; // 调入方采购部门sid
+ @ApiModelProperty("调入方采购部门名称")
+ private String callInBuyerOrgName; // 调入方采购部门名称
}
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
index 4bd29d6a03..898cf4cde8 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
@@ -39,9 +39,16 @@ import com.yxt.anrui.base.api.baseaccadjapply.flow.SubmitBaseAccAdjApplyDto;
import com.yxt.anrui.base.api.baseaccadjapplyeveh.BaseAccadjApplyeVeh;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
+import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer;
+import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerDetailsVo;
+import com.yxt.anrui.base.api.basemanufacturerbank.BaseManPayVo;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
+import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDetailsVo;
import com.yxt.anrui.base.biz.baseaccadjapplyeveh.BaseAccadjApplyeVehService;
import com.yxt.anrui.base.biz.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleService;
+import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService;
+import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService;
import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
import com.yxt.anrui.base.common.enums.VehicleState;
@@ -118,6 +125,11 @@ public class BaseAccadjApplyService extends MybatisBaseService createQueryWrapper(BaseAccadjApplyQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -410,7 +422,7 @@ public class BaseAccadjApplyService extends MybatisBaseService stringList = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
- List baseInternalPurchaseVehicles1 = new ArrayList<>();
+ //关联查询调车车辆列表中的采购部门sid
+ List stringList = baseAccadjApplyeVehService.fetchCallInBuyerOrgSidByMainSid(baseAccadjApply.getSid());
+ List baseAccadjApplyToJDRus = new ArrayList<>();
for (String s : stringList) {
- BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s);
- baseInternalPurchaseVehicles1.add(baseInternalPurchaseVehicle);
- }
- //推送金蝶采购入库单
- StkInStock stkInStock = new StkInStock();
- /**
- * // 入库日期:FDate (必填项)
- */
- stkInStock.setFDate(DateUtil.now());
- /**
- * // 采购部门:FPurchaseDeptId (必填项)
- */
- /*ResultBean pcResubean = sysOrganizationFeign.fetchBySid(baseVehicle.getPurchaseSystemSid());
- if (pcResubean.getSuccess()) {
- SysOrganizationVo vo = pcResubean.getData();
- if (vo != null) {
- stkInStock.setFPurchaseDeptId(vo.getOrgCode());
- }
- }*/
- stkInStock.setFPurchaseDeptId("05.04");
- /**
- * //采购组织:FPurchaseOrgId (必填项)
- */
- //分公司id
- ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCallInOrgSid());
- if (sysOrganizationVoResultBean.getSuccess()) {
- SysOrganizationVo vo = sysOrganizationVoResultBean.getData();
- if (vo != null) {
- stkInStock.setFPurchaseOrgId(vo.getOrgCode());
- /**
- * //分配目标组织:TOrgId (必填项)
- */
- stkInStock.setTOrgId(vo.getOrgCode());
- }
+ List baseInternalPurchaseVehicleList = baseInternalPurchaseVehicleService.fetchByAccSidAndCallInBuyerOrgSid(baseAccadjApply.getSid(), s);
+ BaseAccadjApplyToJDRu baseAccadjApplyToJDRu = new BaseAccadjApplyToJDRu();
+ baseAccadjApplyToJDRu.setCallInBuyerOrgSid(s);
+ baseAccadjApplyToJDRu.setBaseInternalPurchaseVehicles(baseInternalPurchaseVehicleList);
+ baseAccadjApplyToJDRus.add(baseAccadjApplyToJDRu);
}
-
- /**
- * // 供应商:FSupplierId (必填项)
- */
- stkInStock.setFSupplierId("010001");//TODO
- /**
- * // 物料列表:FInStockEntry (必填项)
- */
- List fInStockEntry = new ArrayList<>();
- for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles1) {
- StkInStock.FInStockEntry sf = new StkInStock.FInStockEntry();
- /**
- * 单价 目前放的是内销价 应该是厂家结算价 目前没有厂家结算价 需要后期修改为厂家结算价
- */
- sf.setFPrice(baseInternalPurchaseVehicle.getCostPrice()+"");
+ //推送金蝶销售出库单
+ SalOutStock salOutStock = createSalOutStock(baseAccadjApply);
+ finKingDeeFeign.draftSalOutStock(salOutStock);
+ for (BaseAccadjApplyToJDRu baseAccadjApplyToJDRu : baseAccadjApplyToJDRus) {
+ //推送金蝶采购入库单
+ StkInStock stkInStock = new StkInStock();
/**
- * 车辆类型
+ * // 入库日期:FDate (必填项)
*/
- sf.setCllx("03");//TODO
+ stkInStock.setFDate(DateUtil.now());
/**
- * 车辆类型
+ * // 采购部门:FPurchaseDeptId (必填项)
*/
- sf.setCllxType("03");
+ String callInBuyerOrgSid = baseAccadjApplyToJDRu.getCallInBuyerOrgSid();
+ SysOrganizationVo data = sysOrganizationFeign.fetchBySid(callInBuyerOrgSid).getData();
+ stkInStock.setFPurchaseDeptId(data.getOtherCode());
+ //stkInStock.setFPurchaseDeptId("05.04");
/**
- * // 批号:FLot
+ * //采购组织:FPurchaseOrgId (必填项)
*/
- sf.setFLot(baseInternalPurchaseVehicle.getVinNo());
+ //分公司id
+ ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCallInOrgSid());
+ if (sysOrganizationVoResultBean.getSuccess()) {
+ SysOrganizationVo vo = sysOrganizationVoResultBean.getData();
+ if (vo != null) {
+ stkInStock.setFPurchaseOrgId(vo.getOrgCode());
+ /**
+ * //分配目标组织:TOrgId (必填项)
+ */
+ stkInStock.setTOrgId(vo.getOrgCode());
+ }
+ }
+
/**
- * // 物料编码:FMaterialId (必填项)
+ * // 供应商:FSupplierId (必填项)
*/
- sf.setFMaterialId(baseInternalPurchaseVehicle.getVinNo());
+ List baseInternalPurchaseVehicles2 = baseAccadjApplyToJDRu.getBaseInternalPurchaseVehicles();
+ String vinNo = baseInternalPurchaseVehicles2.get(0).getVinNo();
+ BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(vinNo, callInOrgSid);
+ if (baseVehicle != null) {
+ String supplierSid = baseVehicle.getSupplierSid();
+ BaseManufacturer baseManufacturer = baseManufacturerService.fetchBySid(supplierSid);
+ stkInStock.setFSupplierId(baseManufacturer.getManufacturerCode());
+ }
+ //stkInStock.setFSupplierId("010001");
/**
- * // 仓库:FStockId
+ * // 物料列表:FInStockEntry (必填项)
*/
- ResultBean voResultBean = scmWarehouseFeign.fetchBySid(baseInternalPurchaseVehicle.getInventoryLocationSid());
- if(voResultBean.getSuccess()){
+ List fInStockEntry = new ArrayList<>();
+ for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles2) {
+ StkInStock.FInStockEntry sf = new StkInStock.FInStockEntry();
+ /**
+ * 单价 目前放的是内销价 应该是厂家结算价 目前没有厂家结算价 需要后期修改为厂家结算价
+ */
+ sf.setFPrice(baseInternalPurchaseVehicle.getCostPrice() + "");
+ /**
+ * 车辆类型
+ */
+ BaseVehicle baseVehicle2 = baseVehicleService.selVehicleByVinNoAndOrgSid(vinNo, callInOrgSid);
+ String manufacturerSid = baseVehicle2.getManufacturerSid();
+ String s = baseManufacturerBankService.fetchByMainSidAndManufSaleAccessName(manufacturerSid, baseVehicle2.getManufSaleAccessName());
+ sf.setCllx(s);//TODO
+ /**
+ * 车辆类型
+ */
+ sf.setCllxType(s);
+ /**
+ * // 批号:FLot
+ */
+ sf.setFLot(baseInternalPurchaseVehicle.getVinNo());
+ /**
+ * // 物料编码:FMaterialId (必填项)
+ */
+ sf.setFMaterialId(baseInternalPurchaseVehicle.getVinNo());
+ /**
+ * // 仓库:FStockId
+ */
+ BaseVehicle baseVehicle1 = baseVehicleService.selVehicleByVinNoAndOrgSid(vinNo, callInOrgSid);
//fe.setFStockID(voResultBean.getData().getGressionCode());
- sf.setFStockId(voResultBean.getData().getGressionCode());
+ String location = baseVehicle1.getLocation();
+ ScmWarehouseVo data1 = scmWarehouseFeign.fetchBySid(location).getData();
+ sf.setFStockId(data1.getGressionCode());
// fe.setFStockID("CK001");
//fe.setFStockID(baseInternalPurchaseVehicle.getInventoryLocationSid());
+ /**
+ * 物料分组
+ */
+ BaseVehicleBrand baseVehicleBrand = baseVehicleBrandService.selectByModelSid(baseInternalPurchaseVehicle.getModelSid());
+ if (baseVehicleBrand != null) {
+ sf.setWlfz(baseVehicleBrand.getBrandCode());
+ // sf.setWlfz("01");
+ }
+ /**
+ * 物料分组
+ */
+ //sf.setWlfzType("01");
+ fInStockEntry.add(sf);
}
-
- /**
- * 物料分组
- */
- BaseVehicleBrand baseVehicleBrand = baseVehicleBrandService.selectByModelSid(baseInternalPurchaseVehicle.getModelSid());
- if (baseVehicleBrand != null) {
- sf.setWlfz(baseVehicleBrand.getBrandCode());
- // sf.setWlfz("01");
- }
- /**
- * 物料分组
- */
- //sf.setWlfzType("01");
- fInStockEntry.add(sf);
+ stkInStock.setFInStockEntry(fInStockEntry);
+ finKingDeeFeign.draftStkInStock(stkInStock);
}
- stkInStock.setFInStockEntry(fInStockEntry);
- finKingDeeFeign.draftStkInStock(stkInStock);
- //推送金蝶销售出库单
- SalOutStock salOutStock = createSalOutStock(baseAccadjApply);
- finKingDeeFeign.draftSalOutStock(salOutStock);
} catch (Exception e) {
e.printStackTrace();
}
@@ -540,98 +564,108 @@ public class BaseAccadjApplyService extends MybatisBaseService stringList = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
- List baseInternalPurchaseVehicles = new ArrayList<>();
+ List stringList = baseAccadjApplyeVehService.fetchByAccSidAndCallOutOrgSid(baseAccadjApply.getSid(),baseAccadjApply.getCallOutOrgSid());
+ List baseAccadjApplyToJDRus = new ArrayList<>();
for (String s : stringList) {
- BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s);
- baseInternalPurchaseVehicles.add(baseInternalPurchaseVehicle);
- }
- /**
- * 日期:FDate (必填项)
- */
- salOutStock.setFDate(baseAccadjApply.getApplyDate());
- /**
- * 项目类别:F_PAEZ_Assistant (必填项) 集团内部调车 034
- */
- salOutStock.setF_PAEZ_AssistantKey("034");
- salOutStock.setF_PAEZ_AssistantType("034");
- /**
- * 销售组织:FSaleOrgId (必填项)
- */
- //分公司id
- ResultBean resultBean = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCallOutOrgSid());
- if (resultBean.getSuccess()) {
- SysOrganizationVo vo = resultBean.getData();
- if (vo != null) {
- salOutStock.setFSaleOrgId(vo.getOrgCode());
- //salOutStock.setFSaleOrgId("101");
- }
- }
-
- /**
- * 客户:FCustomerID (必填项)
- */
- salOutStock.setFCustomerID(" JXYXB");
- /**
- * 销售部门:FSaleDeptID (必填项)
- */
- //销售部门id
- ResultBean resultBean1 = sysOrganizationFeign.selectByPSid(baseAccadjApply.getCallOutOrgSid(), "销售支持部");
- if (resultBean1.getSuccess()) {
- SysOrganizationVo vo = resultBean1.getData();
- if (vo != null) {
- salOutStock.setFSaleDeptID(vo.getOrgCode());
- //salOutStock.setFSaleDeptID("05.04");
- }
- }
- /**
- * 发货组织:FStockOrgId (必填项)
- */
- //salOutStock.setFStockOrgId("101");
-
- List fEntity = new ArrayList<>();
- for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) {
- SalOutStock.FEntity fe = new SalOutStock.FEntity();
+ List baseVehicles = baseInternalPurchaseVehicleService.fetchByAccSidAndPurchaseSystemSid(baseAccadjApply.getSid(), s);
+ BaseAccadjApplyToJDRu baseAccadjApplyToJDRu = new BaseAccadjApplyToJDRu();
+ baseAccadjApplyToJDRu.setCallInBuyerOrgSid(s);
+ baseAccadjApplyToJDRu.setBaseVehicles(baseVehicles);
+ baseAccadjApplyToJDRus.add(baseAccadjApplyToJDRu);
+ }
+ for (BaseAccadjApplyToJDRu accadjApplyToJDRus : baseAccadjApplyToJDRus) {
+ String callInBuyerOrgSid = accadjApplyToJDRus.getCallInBuyerOrgSid();
+ List baseVehicles = accadjApplyToJDRus.getBaseVehicles();
/**
- * 单价:FPrice
+ * 日期:FDate (必填项)
*/
- fe.setFPrice(baseInternalPurchaseVehicle.getWitPinMoney());
+ salOutStock.setFDate(baseAccadjApply.getApplyDate());
/**
- * 物料编码:FMaterialID
+ * 项目类别:F_PAEZ_Assistant (必填项) 集团内部调车 034
*/
- fe.setFMaterialID(baseInternalPurchaseVehicle.getVinNo());
+ salOutStock.setF_PAEZ_AssistantKey("034");
+ salOutStock.setF_PAEZ_AssistantType("034");
/**
- * 库存单位:FUnitID (必填项)
+ * 销售组织:FSaleOrgId (必填项)
*/
- /* fe.setFUnitID("liang");*/
- /**
- * 实发数量:FRealQty
- */
- /* fe.setFRealQty(1.0);*/
- /**
- * 批号:FLot
- */
- fe.setFlot(baseInternalPurchaseVehicle.getVinNo());
+ //分公司id
+ ResultBean