【华信科】【WIP小米对接 按不同供应商上传 VC按联合无线供应商账号，安世按华信科的code传】

src/main/java/com/uas/eis/task/SyncProductWIPTask.java

@@ -49,17 +49,18 @@ public class SyncProductWIPTask {
                 String format = sf.format(new Date());
                 data.put("request_time",format);
                 List<Map<String,Object>> list = new ArrayList<>();
-                String Sql="select * from (select rownum rn,to_char(nvl(cd_date_1,to_date('1970-01-01','yyyy-mm-dd')),'yyyy-mm-dd hh24:mi:ss') cd_date_ywfs, A.* from (select ct_id,ct_code,CUSTOMTABLEDETAIL.* from CUSTOMTABLE left join CUSTOMTABLEDETAIL on ct_id=cd_ctid " +
-                        " where  ct_caller='XiaoMiProductWIP' and ct_id= " +
+                String Sql="select * from (select rownum rn,to_char(nvl(cd_date_1,to_date('1970-01-01','yyyy-mm-dd')),'yyyy-mm-dd hh24:mi:ss') cd_date_ywfs, A.* from (select pr_brand,ct_id,ct_code,CUSTOMTABLEDETAIL.* from CUSTOMTABLE left join CUSTOMTABLEDETAIL on ct_id=cd_ctid " +
+                        " left join product on pr_code = cd_varchar50_4 where  ct_caller='XiaoMiProductWIP' and ct_id= " +
                         " (select ct_id from (select ct_id from CUSTOMTABLE where ct_caller='XiaoMiProductWIP' " +
                         //"and trunc(ct_recorddate)=trunc(sysdate) " +
                         "and ct_statuscode='AUDITED' and nvl(CT_SENDSTATUS,' ')<>'已上传' order by ct_id ) where rownum=1)" +
+                        " and PR_BRAND in ('NEXPERIA','VANCHIP') " +
                         " order by cd_detno) A) where rn<=1000";
                 SqlRowList rs = baseDao.queryForRowSet(Sql);
 
                 while (rs.next()){
                     Map<String,Object> map = new HashMap<>();
-                    map.put("factory_code",configuration.getX5vendercode());
+                    map.put("factory_code","VANCHIP".equals(rs.getGeneralString("cd_varchar50_2")) ? configuration.getX5vendercode() : configuration.getX5vendercodeSZ());
                     map.put("component_code",rs.getGeneralString("cd_varchar50_1"));
                     map.put("process",rs.getGeneralString("cd_varchar50_2"));
                     map.put("line_id",rs.getGeneralString("cd_varchar50_3"));

src/main/java/com/uas/eis/utils/Configuration.java

@@ -1,7 +1,6 @@
 package com.uas.eis.utils;
 
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.PropertySource;
 import org.springframework.stereotype.Service;
 
 /**
@@ -79,6 +78,9 @@ public class Configuration {
     @Value("${spring.datasource.username}")
     private String username;
 
+    @Value("${fs.x5vendercodeSZ}")
+    private String x5vendercodeSZ;
+
     public String getUsername() {
         return username;
     }
@@ -174,4 +176,12 @@ public class Configuration {
     public void setX5ProductStockUrl(String x5ProductStockUrl) {
         this.x5ProductStockUrl = x5ProductStockUrl;
     }
+
+    public String getX5vendercodeSZ() {
+        return x5vendercodeSZ;
+    }
+
+    public void setX5vendercodeSZ(String x5vendercodeSZ) {
+        this.x5vendercodeSZ = x5vendercodeSZ;
+    }
 }

src/main/resources/application-prod.yml

@@ -56,6 +56,7 @@ fs:
     x5ProductStockUrl: https://mipop.p.mi.com/HttpAdapter/HttpMessageServlet?interfaceNamespace=http://xiaomi.com/oem/dummy&interface=SI_MI_OEM_IF123_VENDOR_STOCK_S_OUT&senderService=HK_INFOTM_PRD&qos=BE
     x5ProductWIPUrl: https://mipop.p.mi.com/HttpAdapter/HttpMessageServlet?interfaceNamespace=http://xiaomi.com/oem/dummy&interface=SI_MI_OEM_IF122_VENDOR_WIP_S_OUT&senderService=HK_INFOTM_PRD&qos=BE
     x5vendercode: 108207
+    x5vendercodeSZ: 108717
 
 #    以下为测试环境
 #    x5username: RFCMESHKIFTM