diff --git a/anrui-fin/anrui-fin-biz/src/main/resources/ftl/prePaymentApply.ftl b/anrui-fin/anrui-fin-biz/src/main/resources/ftl/prePaymentApply.ftl
index a28005c18e..e35cd4b813 100644
--- a/anrui-fin/anrui-fin-biz/src/main/resources/ftl/prePaymentApply.ftl
+++ b/anrui-fin/anrui-fin-biz/src/main/resources/ftl/prePaymentApply.ftl
@@ -200,10 +200,6 @@
-
-
-
-
@@ -476,6 +472,10 @@
+
+
+
+
@@ -541,6 +541,10 @@
+
+
+
+
@@ -667,6 +671,10 @@
+
+
+
+
@@ -732,6 +740,10 @@
+
+
+
+
@@ -784,6 +796,8 @@
${payRemark!}
+
+
@@ -899,109 +913,47 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <#list lcList as lc>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${lc.name!} ${lc.comment!} ${lc.spsj!}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- </#list>
-
-
-
+ <#list lcList?sort_by("spsj") as lc>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${lc.name!} ${lc.omment!} ${lc.spsj!}
+
+
+
+
@@ -1019,7 +971,7 @@
-
@@ -1051,14 +1003,14 @@
xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes">
Normal.dotm
2
- 89
- 289
+ 84
+ 264
0
0
- 2
+ 4
false
false
- 356
+ 309
WPS Office_11.1.0.12598_F1E327BC-269C-435d-A152-05C5408002CA
0
@@ -1074,7 +1026,7 @@
2014-10-29T12:08:00Z
God
God
- 2022-10-28T05:48:58Z
+ 2022-10-31T01:05:50Z
@@ -1087,7 +1039,7 @@
2052-11.1.0.12598
- 89F9718AB4114594B3BD93F817CE628C
+ 995D509E4C0348AABAC9EB9BB6072747
@@ -1163,31 +1115,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1207,7 +1134,7 @@
xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml"
xmlns:sl="http://schemas.openxmlformats.org/schemaLibrary/2006/main"
xmlns:wpsCustomData="http://www.wps.cn/officeDocument/2013/wpsCustomData" mc:Ignorable="w14">
-
+
@@ -1251,20 +1178,31 @@
+
+
+
+
-
+
+
+
+
+
+
+
+
@@ -1773,7 +1711,7 @@
-
+
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 8a881d5633..b4f81b070c 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
@@ -354,6 +354,10 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService list = new ArrayList<>();
list.add(baseVehicleDto);
baseVehicleFeign.saveOrUpdate(list, OperVehicleState.EventType.UPDATE_VEHICLE.getCode());
- Boolean aBoolean = finKingDeeFeign.getStinstockState(dto.getVin()).getData();
- if (aBoolean) {
- //推送调拨单
- //根据分公司sid查询分公司编码
- String useOrgSid = scmVehicleEnterlibrary.getUseOrgSid();
- ResultBean sysOrg = sysOrganizationFeign.fetchBySid(useOrgSid);
- SysOrganizationVo sysOrganizationVo = sysOrg.getData();
- List FPAYBILLENTRYs = new ArrayList<>();
- StkTransferDirect stkTransferDirect = new StkTransferDirect();
+ //推送调拨单
+ //根据分公司sid查询分公司编码
+ String useOrgSid = scmVehicleEnterlibrary.getUseOrgSid();
+ ResultBean sysOrg = sysOrganizationFeign.fetchBySid(useOrgSid);
+ SysOrganizationVo sysOrganizationVo = sysOrg.getData();
+ List FPAYBILLENTRYs = new ArrayList<>();
+ StkTransferDirect stkTransferDirect = new StkTransferDirect();
// stkTransferDirect.setFStockOutOrgId("101"); //调出库存组织
// stkTransferDirect.setFStockOrgId("101"); //调入库存组织
- // stkTransferDirect.setFStockOutOrgId(sysOrganizationVo.getOrgCode()); //调出库存组织
- stkTransferDirect.setFStockOrgId(sysOrganizationVo.getOrgCode()); //调入库存组织
- stkTransferDirect.setFDate(scmVehicleEnterlibrary.getInboundDate()); //日期
- StkTransferDirect.FBillEntry fBillEntry = new StkTransferDirect.FBillEntry();
- ScmWarehouse scmWarehouse = scmWarehouseService.fetchBySid(scmVehicleEnterlibrary.getLocationSid());
+ // stkTransferDirect.setFStockOutOrgId(sysOrganizationVo.getOrgCode()); //调出库存组织
+ stkTransferDirect.setFStockOrgId(sysOrganizationVo.getOrgCode()); //调入库存组织
+ stkTransferDirect.setFDate(scmVehicleEnterlibrary.getInboundDate()); //日期
+ StkTransferDirect.FBillEntry fBillEntry = new StkTransferDirect.FBillEntry();
+ ScmWarehouse scmWarehouse = scmWarehouseService.fetchBySid(scmVehicleEnterlibrary.getLocationSid());
// fBillEntry.setFDestStockId("CK003");//调入仓库
- fBillEntry.setFDestStockId(scmWarehouse.getGressionCode());//调入仓库
- fBillEntry.setFMaterialId(scmVehicleEnterlibrary.getVinNo());//物料编码
+ fBillEntry.setFDestStockId(scmWarehouse.getGressionCode());//调入仓库
+ fBillEntry.setFMaterialId(scmVehicleEnterlibrary.getVinNo());//物料编码
// fBillEntry.setFSrcStockId("CK001");//调出仓库
- fBillEntry.setFSrcStockId("ARZTCK");//调出仓库 在途
- FPAYBILLENTRYs.add(fBillEntry);
- stkTransferDirect.setFBillEntry(FPAYBILLENTRYs);
- ResultBean resultBean = finKingDeeFeign.draftStkTransferDirect(stkTransferDirect);
- }
+ fBillEntry.setFSrcStockId("ARZTCK");//调出仓库 在途
+ FPAYBILLENTRYs.add(fBillEntry);
+ stkTransferDirect.setFBillEntry(FPAYBILLENTRYs);
+ ResultBean resultBean = finKingDeeFeign.draftStkTransferDirect(stkTransferDirect);
}
//外采
if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(scmVehicleEnterlibrary.getPurchaseTypeKey())) {