调车下一环节没人自动跳过

出库推送其他应收单单据编号加尾号区分
出库推送其他应收单补充物料编码和物料名称

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java

@@ -626,11 +626,12 @@ 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);
             }
+        }
         if (shuntingTypeValue.equals("调出")) {
             List<Map<String, Object>> l = ConstantUtils.getListData(bv.getFormVariables(), "baseInternalPurchaseVehicles");
             for (int i = 0; i < l.size(); i++) {
@@ -672,11 +673,12 @@ 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);
             }
+        }
         if (bv.getTaskId().equals(baseInternalPurchase.getTaskId())) {
             Map<String, Object> variables = new HashMap<>();
             Map<String, Object> appMap = 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);
+        }
         if (bv.getTaskId().equals(baseInternalPurchase.getTaskId())) {
             Map<String, Object> variables = new HashMap<>();
             Map<String, Object> appMap = new HashMap<>();

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 {//贷款

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;
     }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/OtherReceivableBillService.java

@@ -100,6 +100,7 @@ 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_PMZC_Base1", c.getMaterialNo());
             collectionDetailMap.add(m);
         }
         return rb.success().setData(collectionDetailMap);

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",