人员信息新增是否跟单员字段；是传“X”，否传“”

huigou-xt/src/main/webapp/system/opm/organization/PersonDetail.jsp

@@ -31,8 +31,8 @@
 				<x:selectC name="isSapPerson" required="true" label="SAP员工" dictionary="yesorno" labelCol="2" fieldCol="4" />
 			</div>
 			<div class="hg-form-row" id="sapMes2">
+				<x:selectC name="isMerchandiser" required="false" label="是否跟单员" dictionary="yesorno" labelCol="2" fieldCol="4" />
 				<x:selectC name="langu" label="语言" labelCol="2" fieldCol="4" dictionary="langu"/>
-				<x:selectC dictionary="country" name="country" label="国家" labelCol="2" fieldCol="4" />
 			</div>
 		</div>
 		<div class="col-md-4">
@@ -47,9 +47,12 @@
 	<div id="sapMes" hidden="hidden">
 		<div class="hg-form-row">
 			<div class="col-md-8">
+				<x:selectC dictionary="country" name="country" label="国家" labelCol="2" fieldCol="4" />
 				<x:inputC name="regionName" label="地区" labelCol="2" fieldCol="4" maxlength="16" wrapper="select"/>
 				<x:hidden name="region"/>
-				<x:selectC dictionary="country" name="bankCountry" label="银行所属国家" labelCol="2" fieldCol="4" />
+			</div>
+			<div class="col-md-4">
+				<x:selectC dictionary="country" name="bankCountry" label="银行所属国家" labelCol="4" fieldCol="8" />
 			</div>
 		</div>
 		<div class="hg-form-row">

topsun/src/main/java/com/huigou/topsun/syncOrg/application/impl/OrgSyncApplicationImpl.java

@@ -167,6 +167,12 @@ public class OrgSyncApplicationImpl extends BaseApplication implements OrgSyncAp
             }else if ("1".equals(sapPersonVo.getSex())){
                 mdClientSapVo.setTitle("0001");//女
             }
+            //是否跟单员
+            if ("1".equals(sapPersonVo.getIsMerchandiser())){
+                mdClientSapVo.setZgendan("X");
+            }else {
+                mdClientSapVo.setZgendan("");
+            }
             mdClientSapVo.setTelNumber(sapPersonVo.getOfficePhone());//办公电话
             mdClientSapVo.setMobNumber(sapPersonVo.getMobilePhone());//移动电话
             mdClientSapVo.setPostCode1(sapPersonVo.getZip());//邮编

topsun/src/main/java/com/huigou/topsun/syncOrg/vo/SapPersonVo/MdClientSapVo.java

@@ -274,6 +274,12 @@ public class MdClientSapVo {
     @JsonProperty("LIFNR")
     private String lifnr;
 
+    /**
+     * 是否跟单员
+     */
+    @JsonProperty("ZGENDAN")
+    private String zgendan;
+
     /**
      * 客户品牌联系人列表
      */

topsun/src/main/java/com/huigou/topsun/syncOrg/vo/SapPersonVo/SapPersonVo.java

@@ -130,4 +130,10 @@ public class SapPersonVo implements Serializable {
      */
     @JsonProperty("KOSTL")
     private String kostl;
+
+    /**
+     * 是否跟单员
+     */
+    @JsonProperty("IS_MERCHANDISER")
+    private String isMerchandiser;
 }

topsun/src/main/java/com/huigou/uasp/bmp/opm/domain/model/org/Person.java

@@ -249,6 +249,12 @@ public class Person extends BaseInfoWithTenantAbstractEntity {
     @Column(name = "COMPANY_CODE")
     private String companyCode;
 
+    /**
+     * 是否跟单员
+     */
+    @Column(name = "is_merchandiser")
+    private String isMerchandiser;
+
     /**
      * SAP返回消息状态
      */
@@ -261,6 +267,14 @@ public class Person extends BaseInfoWithTenantAbstractEntity {
     @Column(name = "MESSAGE")
     private String message;
 
+    public String getIsMerchandiser() {
+        return isMerchandiser;
+    }
+
+    public void setIsMerchandiser(String isMerchandiser) {
+        this.isMerchandiser = isMerchandiser;
+    }
+
     public String getType() {
         return type;
     }

topsun/src/main/resources/config/topsun/base/syncOrg.xml

@@ -22,6 +22,7 @@
             p.REGION,
             p.LANGU,
             op.PROPERTY_VALUE AS KOSTL,
+            p.IS_OPERATOR,
             CASE WHEN ( p.type = 'S' AND (p.STATUS = - 1 || p.STATUS = 0)) THEN 'D'
              WHEN ( p.type = 'S' AND p.STATUS = 1 ) THEN 'U'
              WHEN ( P.type IS NULL || p.type = '' ) THEN 'I'
@@ -53,6 +54,7 @@
             p.REGION,
             p.LANGU,
             op.PROPERTY_VALUE AS KOSTL,
+            p.IS_MERCHANDISER,
              CASE WHEN ( p.type = 'S' AND (p.STATUS = - 1 || p.STATUS = 0) ) THEN 'D'
              WHEN ( p.type = 'S' AND p.STATUS = 1 ) THEN 'U'
              WHEN ( P.type IS NULL || p.type = '' ) THEN 'I'