Merge remote-tracking branch 'origin/master'

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<BaseManufacturer
         List<String> orgList2 = selectOrgList(type);
         HashSet h1 = new HashSet(stringList);
         HashSet h2 = new HashSet(orgList2);
+        //排除掉已存在类别为分公司的
         h1.removeAll(h2);
         stringList.clear();
         stringList.addAll(h1);

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<ApPayBill.FPAYBILLENTRY> fpaybillentrYs = apPayBill.getFPAYBILLENTRY();
             List<Map<String, String>> 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());

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": []
 }

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<SysUserMapper, SysUser> {
                     SysStaffOrgVo sysStaffOrgVo = orgVoList.get(0);
                     userInfoOneVo.setDepartmentName(sysStaffOrgVo.getOrgName());
                     userInfoOneVo.setDepartmentSid(sysStaffOrgVo.getOrgSid());
-                    String psid = sysOrganizationService.fetchBySid(sysStaffOrgVo.getOrgSid()).getPsid();
+                    SysOrganization sysOrganizationOne = sysOrganizationService.fetchBySid(sysStaffOrgVo.getOrgSid());
-                    String name = sysOrganizationService.fetchBySid(psid).getName();
+                    if(sysOrganizationOne != null){
-                    userInfoOneVo.setPNameAndDepartmentNameAndPostName(name + "-" + sysStaffOrgVo.getOrgName());
+                        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());

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

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<ScmFileVo> scmFiles;
+
+    @ApiModelProperty("配置sid")
+    private String configSid;
 }