From cc38b2685505fcc58e72642e2233a92e9180a1ce Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Fri, 1 Dec 2023 16:59:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=BD=A6=E4=B8=8B=E4=B8=80=E7=8E=AF?=
 =?UTF-8?q?=E8=8A=82=E6=B2=A1=E4=BA=BA=E8=87=AA=E5=8A=A8=E8=B7=B3=E8=BF=87?=
 =?UTF-8?q?=20=E5=87=BA=E5=BA=93=E6=8E=A8=E9=80=81=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E5=BA=94=E6=94=B6=E5=8D=95=E5=8D=95=E6=8D=AE=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E5=8A=A0=E5=B0=BE=E5=8F=B7=E5=8C=BA=E5=88=86=20=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E6=8E=A8=E9=80=81=E5=85=B6=E4=BB=96=E5=BA=94=E6=94=B6?=
 =?UTF-8?q?=E5=8D=95=E8=A1=A5=E5=85=85=E7=89=A9=E6=96=99=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E5=92=8C=E7=89=A9=E6=96=99=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseInternalPurchaseService.java          | 21 +++++++++++--------
 .../basevehicleout/BaseVehicleOutService.java | 16 ++++++++++----
 .../otherarreceivable/OtherReceivable.java    |  2 ++
 .../OtherReceivableBillService.java           | 17 ++++++++-------
 .../otherreceivablebill/data_FEntity.json     |  3 +++
 5 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
index 99e22eaa95..42edfa7680 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
@@ -626,10 +626,11 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                 }
             }
             if (StringUtils.isBlank(nextNodeUserSids)) {
-                return rb.setMsg("下一环节暂无操作人员");
+                bv.setNextNodeUserSids(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
+            }else {
+                String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
+                bv.setNextNodeUserSids(substring);
             }
-            String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
-            bv.setNextNodeUserSids(substring);
         }
         if (shuntingTypeValue.equals("调出")) {
             List<Map<String, Object>> l = ConstantUtils.getListData(bv.getFormVariables(), "baseInternalPurchaseVehicles");
@@ -672,10 +673,11 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                 }
             }
             if (StringUtils.isBlank(nextNodeUserSids)) {
-                return rb.setMsg("下一环节暂无操作人员");
+                bv.setNextNodeUserSids(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
+            }else {
+                String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
+                bv.setNextNodeUserSids(substring);
             }
-            String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
-            bv.setNextNodeUserSids(substring);
         }
         if (bv.getTaskId().equals(baseInternalPurchase.getTaskId())) {
             Map<String, Object> variables = new HashMap<>();
@@ -740,10 +742,11 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
             }
         }
         if (StringUtils.isBlank(nextNodeUserSids)) {
-            return rb.setMsg("下一环节暂无操作人员");
+            bv.setNextNodeUserSids(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
+        }else {
+            String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
+            bv.setNextNodeUserSids(substring);
         }
-        String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
-        bv.setNextNodeUserSids(substring);
         if (bv.getTaskId().equals(baseInternalPurchase.getTaskId())) {
             Map<String, Object> variables = new HashMap<>();
             Map<String, Object> appMap = new HashMap<>();
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
index 677a8bb928..e866fed13a 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
@@ -1688,11 +1688,14 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                 finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz);
             }
             //推送其他应收单
+            int z = 1;
             for (BaseVehicleZSOutDto zcDto : zcDtos) {
+                String otherNum = String.format("%02d", z);
                 zcDto.setCwCustomerNo(salOutStock.getFCustomerID());
-                OtherReceivable otherReceivable = createZSOtherReceivableQKC(baseVehicleOutApply, zcDto);
+                OtherReceivable otherReceivable = createZSOtherReceivableQKC(baseVehicleOutApply, zcDto, otherNum);
                 if (otherReceivable != null) {
                     finKingDeeFeign.draftOtherReceivableBill(otherReceivable);
+                    z = z + 1;
                 }
             }
         }
@@ -1759,9 +1762,9 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         return rb.success();
     }
 
-    private OtherReceivable createZSOtherReceivableQKC(BaseVehicleOutApply baseVehicleOutApply, BaseVehicleZSOutDto zcDto) {
+    private OtherReceivable createZSOtherReceivableQKC(BaseVehicleOutApply baseVehicleOutApply, BaseVehicleZSOutDto zcDto,String otherNum) {
         OtherReceivable otherReceivableOne = new OtherReceivable();
-        otherReceivableOne.setBillNo(baseVehicleOutApply.getBillNo());
+        otherReceivableOne.setBillNo(baseVehicleOutApply.getBillNo() + "-" + otherNum);
         otherReceivableOne.setCommUnit(zcDto.getCwCustomerNo());
         SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(baseVehicleOutApply.getCreateOrgSid()).getData();
         otherReceivableOne.setCollectionOrg(sysOrganizationVo1.getOrgCode());
@@ -1771,7 +1774,9 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         OtherReceivable.CollectionDetailDto collectionDetailDtoTwo = new OtherReceivable.CollectionDetailDto();
         SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(baseVehicleOutApply.getOrgSid()).getData();
         collectionDetailDtoOne.setDearDept(sysOrganizationVo2.getOrgCode());
+        collectionDetailDtoOne.setMaterialNo(zcDto.getVinNo().substring(zcDto.getVinNo().length() - 8));
         collectionDetailDtoTwo.setDearDept(sysOrganizationVo2.getOrgCode());
+        collectionDetailDtoTwo.setMaterialNo(zcDto.getVinNo().substring(zcDto.getVinNo().length() - 8));
         BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(baseVehicleOutApply.getContractNo()).getData();
         if ("2".equals(busSalesOrder.getFinancePlan()) && "1".equals(busSalesOrder.getPayTypeKey())) {
             BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(baseVehicleOutApply.getContractNo(), zcDto.getVinSid()).getData();
@@ -2277,10 +2282,13 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                 finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz);
             }
             //推送其他应收单
+            int z = 1;
             for (BaseVehicleZSOutDto zcDto : zcDtos) {
-                OtherReceivable otherReceivable = createZSOtherReceivableQKC(baseVehicleOutApply, zcDto);
+                String otherNum = String.format("%02d", z);
+                OtherReceivable otherReceivable = createZSOtherReceivableQKC(baseVehicleOutApply, zcDto, otherNum);
                 if (otherReceivable != null) {
                     finKingDeeFeign.draftOtherReceivableBill(otherReceivable);
+                    z = z + 1;
                 }
             }
         } else {//贷款
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/otherarreceivable/OtherReceivable.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/otherarreceivable/OtherReceivable.java
index 0dc3971ab4..2be06fbe16 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/otherarreceivable/OtherReceivable.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/otherarreceivable/OtherReceivable.java
@@ -43,5 +43,7 @@ public class OtherReceivable {
         public String exTaxMoney;
         @ApiModelProperty("用途")
         public String useTo;
+        @ApiModelProperty("物料编码")
+        public String materialNo;
     }
 }
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/OtherReceivableBillService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/OtherReceivableBillService.java
index a43cd8a757..0f2f368524 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/OtherReceivableBillService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/OtherReceivableBillService.java
@@ -39,7 +39,7 @@ public class OtherReceivableBillService extends FinKingDeeService {
         }
         map_fEntityModel_.put("FDATE", otherReceivable.getBussDate());
         //到期日期
-        map_fEntityModel_.put("FENDDATE_H",otherReceivable.getBussDate());
+        map_fEntityModel_.put("FENDDATE_H", otherReceivable.getBussDate());
         //客户
         if (otherReceivable.getCommUnit() == null) {
             return rb.setMsg("客户编码不能为空");
@@ -53,11 +53,11 @@ public class OtherReceivableBillService extends FinKingDeeService {
         //收款组织
         map_fEntityModel_.put("FSETTLEORGID", otherReceivable.getCollectionOrg());
         //销售组织
-        map_fEntityModel_.put("FSALEORGID",otherReceivable.getCollectionOrg());
+        map_fEntityModel_.put("FSALEORGID", otherReceivable.getCollectionOrg());
         //销售部门
-        map_fEntityModel_.put("FSALEDEPTID",otherReceivable.getCollectionDetails().get(0).getDearDept());
+        map_fEntityModel_.put("FSALEDEPTID", otherReceivable.getCollectionDetails().get(0).getDearDept());
         //申请部门
-        map_fEntityModel_.put("FDEPARTMENTID",otherReceivable.getCollectionDetails().get(0).getDearDept());
+        map_fEntityModel_.put("FDEPARTMENTID", otherReceivable.getCollectionDetails().get(0).getDearDept());
         List<OtherReceivable.CollectionDetailDto> collectionDetails = otherReceivable.getCollectionDetails() == null ? new ArrayList<>() : otherReceivable.getCollectionDetails();
         //准备 物料列表的数据
         ResultBean<List<Map<String, String>>> vehicleListMap = createVehicleListsForReceivableBill(collectionDetails);
@@ -67,14 +67,14 @@ public class OtherReceivableBillService extends FinKingDeeService {
         String kingDeeData = OtherReceivableBillCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_, vehicleListMap.getData());
         try {
             ResultBean<String> resultBean1 = accessKingDeeInterface(KingDeeBillId.AR_OTHERRECEIVABLE.getID(), kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL());
-            if(!resultBean1.getSuccess()){
+            if (!resultBean1.getSuccess()) {
                 log.info("其他应收单保存失败!");
                 return rb.setMsg("其他应收单保存失败!");
             }
             log.info("其他应收单保存成功!");
-            String submitKD = getSubmitKD(resultBean1.getData(),KingDeeBillId.AR_OTHERRECEIVABLE.getID());
+            String submitKD = getSubmitKD(resultBean1.getData(), KingDeeBillId.AR_OTHERRECEIVABLE.getID());
             ResultBean<String> resultBean2 = accessKingDeeInterface(KingDeeBillId.AR_OTHERRECEIVABLE.getID(), submitKD, KingDeeBillUrl.SUBMIT_URL.getURL());
-            if(!resultBean2.getSuccess()){
+            if (!resultBean2.getSuccess()) {
                 log.info("其他应收单提交失败!");
                 return rb.setMsg("其他应收单提交失败!");
             }
@@ -99,7 +99,8 @@ public class OtherReceivableBillService extends FinKingDeeService {
             }
             m.put("FCOSTDEPARTMENTID", c.getDearDept());
             m.put("FNOTAXAMOUNTFOR", c.getExTaxMoney());
-            m.put("F_PAEZ_Assistant1",c.getUseTo());
+            m.put("F_PAEZ_Assistant1", c.getUseTo());
+            m.put("F_PMZC_Base1", c.getMaterialNo());
             collectionDetailMap.add(m);
         }
         return rb.success().setData(collectionDetailMap);
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_FEntity.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_FEntity.json
index 7ba1c2d80c..20349d3434 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_FEntity.json
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_FEntity.json
@@ -26,6 +26,9 @@
     "FNumber": ""
   },
   "FCOMMENT": "",
+  "F_PMZC_Base1": {
+    "FNUMBER": "@KD_F_PMZC_Base1"
+  },
   "FSourceBillNo": "",
   "FCREATEINVOICE": "false",
   "FIVAmountFor": "0",