From 4252008498bb6a04f458fb083e4a8d784d1f844b Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Wed, 12 Oct 2022 09:30:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=94=BE=E5=BC=80=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E5=8D=95=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=98=A0=E5=B0=84=E8=A1=A8=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/fin/biz/kingdee/appaybill/ApPayBillService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillService.java index d2ee51d07c..09041a1802 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillService.java @@ -36,7 +36,7 @@ public class ApPayBillService extends FinKingDeeService { if(!success){ return rb.setMsg(sysMappingInfoVoResultBean.getMsg()); } - map_fEntityModel_.put("F_PAEZ_Assistant","001");//sysMappingInfoVoResultBean.getData().getMap_itemKey()); + map_fEntityModel_.put("F_PAEZ_Assistant",sysMappingInfoVoResultBean.getData().getMap_itemKey());//"001"); //准备 物料列表的数据 ForEntryBill List fpaybillentrYs = apPayBill.getFPAYBILLENTRY(); List> vehicleListMap = createVehicleLists(fpaybillentrYs); @@ -47,13 +47,13 @@ public class ApPayBillService extends FinKingDeeService { if(! sysMappingInfoVoResultBean.getSuccess()){ return rb.setMsg(sysMappingInfoVoResultBean.getMsg()); } - params.put("FPURPOSEID","SFKYT08_SYS");//sysMappingInfoVoResultBean.getData().getMap_itemKey()); + params.put("FPURPOSEID",sysMappingInfoVoResultBean.getData().getMap_itemKey());//"SFKYT08_SYS"); //结算方式 sysMappingInfoVoResultBean = getSysMappingInfoVoResultBean( "结算方式", params.get("FSETTLETYPEIDKey"), params.get("FSETTLETYPEIDType")); if(!sysMappingInfoVoResultBean.getSuccess()){ return rb.setMsg(sysMappingInfoVoResultBean.getMsg()); } - params.put("FSETTLETYPEID","02");//sysMappingInfoVoResultBean.getData().getMap_itemKey()); + params.put("FSETTLETYPEID",sysMappingInfoVoResultBean.getData().getMap_itemKey());//"02");// } String kingDeeData = ApPayBillCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_,vehicleListMap); return accessKingDeeInterface(KingDeeBillId.AP_PAYBILL.getID(),kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL()); From 20cad2fb2e6f9c96c8b63ce864baeed8fa553d83 Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Wed, 12 Oct 2022 09:57:54 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=94=BE=E5=BC=80=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E5=8D=95=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=98=A0=E5=B0=84=E8=A1=A8=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/anrui/fin/biz/kingdee/appaybill/data_model.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_model.json index 43ee1bca10..afc453d8e6 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_model.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_model.json @@ -41,7 +41,7 @@ "FREALPAY": false, "FREMARK": "@KD_FREMARK", "F_PAEZ_Assistant": { - "FNumber": "001" + "FNumber": "@KD_F_PAEZ_Assistant" }, "FPAYBILLENTRY": [] } \ No newline at end of file From a0bba3ac614f86a6686609b04502c2fe1ddd6586 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 12 Oct 2022 10:03:53 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/base/biz/basemanufacturer/BaseManufacturerService.java | 1 + 1 file changed, 1 insertion(+) 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 1ecfc43f9e..0b451921b9 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 @@ -527,6 +527,7 @@ public class BaseManufacturerService extends MybatisBaseService orgList2 = selectOrgList(type); HashSet h1 = new HashSet(stringList); HashSet h2 = new HashSet(orgList2); + //排除掉已存在类别为分公司的 h1.removeAll(h2); stringList.clear(); stringList.addAll(h1); From 86970b246b4ec233fcb19d40b97ac08a6f3e6f3c Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 12 Oct 2022 11:16:01 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=85=8D=E7=BD=AEsid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/anrui/portal/biz/sysuser/SysUserService.java | 9 ++++++--- .../scm/api/scmapplyinbound/ScmApplyInboundDto.java | 1 - .../anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java | 3 +++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java index e80617c187..1d9577a27b 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java @@ -337,9 +337,12 @@ public class SysUserService extends MybatisBaseService { SysStaffOrgVo sysStaffOrgVo = orgVoList.get(0); userInfoOneVo.setDepartmentName(sysStaffOrgVo.getOrgName()); userInfoOneVo.setDepartmentSid(sysStaffOrgVo.getOrgSid()); - String psid = sysOrganizationService.fetchBySid(sysStaffOrgVo.getOrgSid()).getPsid(); - String name = sysOrganizationService.fetchBySid(psid).getName(); - userInfoOneVo.setPNameAndDepartmentNameAndPostName(name + "-" + sysStaffOrgVo.getOrgName()); + SysOrganization sysOrganizationOne = sysOrganizationService.fetchBySid(sysStaffOrgVo.getOrgSid()); + if(sysOrganizationOne != null){ + String psid = sysOrganizationOne.getPsid(); + String name = sysOrganizationService.fetchBySid(psid).getName(); + userInfoOneVo.setPNameAndDepartmentNameAndPostName(name + "-" + sysStaffOrgVo.getOrgName()); + } userInfoOneVo.setOrganizationSid(sysStaffOrgVo.getOrgSid()); userInfoOneVo.setOrganizationName(sysStaffOrgVo.getOrgName()); userInfoOneVo.setOrgNamePath(sysStaffOrg.getOrgNamePath()); diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java index 02bf5572c2..aa3c889a62 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java @@ -61,7 +61,6 @@ public class ScmApplyInboundDto implements Dto { private String vehicleOrderSid; @ApiModelProperty("采购订单编号") - @NotBlank(message = "采购订单编号不能为空") private String purchaseOrderNo; @ApiModelProperty("车型sid ") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java index a45efddffc..c971a5a88d 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java @@ -149,4 +149,7 @@ public class ScmApplyInboundVo implements Vo { private String manPurOrderTypeValue; @ApiModelProperty("附件信息表") private List scmFiles; + + @ApiModelProperty("配置sid") + private String configSid; }