diff --git a/lc123/cloud/app/plugin/operate/sys/BGZczOpPlugin.java b/lc123/cloud/app/plugin/operate/sys/BGZczOpPlugin.java index f663926..596aff9 100644 --- a/lc123/cloud/app/plugin/operate/sys/BGZczOpPlugin.java +++ b/lc123/cloud/app/plugin/operate/sys/BGZczOpPlugin.java @@ -72,7 +72,7 @@ public class BGZczOpPlugin extends AbstractOperationServicePlugIn { DynamicObject file2 = BusinessDataServiceHelper.loadSingle("tqq9_proxyandfactory", "id,number,name,tqq9_prolicense,tqq9_type", new QFilter[]{new QFilter("number", QFilter.equals, number2)}); String MFCode = file2.getString("number"); - String ProLicenceCode = file2.getString("tqq9_prolicense"); + String ProLicenceCode = entry.getString("tqq9_e_supno"); scsmap.put("MFCode", MFCode); scsmap.put("ProLicenceCode", ProLicenceCode); String tqq9_type = file2.getString("tqq9_type");//厂商类型 @@ -84,6 +84,23 @@ public class BGZczOpPlugin extends AbstractOperationServicePlugIn { bglist.add(scsmap); } } + + String tqq9_type = dataEntity.getString("tqq9_type"); + //进口 A 显示总代 + if ("A".equals(tqq9_type)) { + HashMap map = new HashMap<>(); + DynamicObject tqq9_proxy = dataEntity.getDynamicObject("tqq9_proxy");//总代 + if (null != tqq9_proxy) { + String MFCode = tqq9_proxy.getString("number"); + map.put("MFCode", MFCode); + map.put("isAgent", "1");//代理商 + } + String tqq9_proxyno = dataEntity.getString("tqq9_proxyno");//总代许可证号 + map.put("ProLicenceCode", tqq9_proxyno); + bglist.add(map); + + } + //123564 //北京 //获取单据中附件面板信息 diff --git a/lc123/cloud/app/plugin/operate/sys/WmsZczSyncOpPlugin.java b/lc123/cloud/app/plugin/operate/sys/WmsZczSyncOpPlugin.java index 0d40089..ba82bdf 100644 --- a/lc123/cloud/app/plugin/operate/sys/WmsZczSyncOpPlugin.java +++ b/lc123/cloud/app/plugin/operate/sys/WmsZczSyncOpPlugin.java @@ -46,6 +46,9 @@ public class WmsZczSyncOpPlugin extends AbstractOperationServicePlugIn { e.getFieldKeys().add("tqq9_typethree"); e.getFieldKeys().add("tqq9_remark"); e.getFieldKeys().add("tqq9_entry.tqq9_e_supplier"); + e.getFieldKeys().add("tqq9_proxy"); + e.getFieldKeys().add("tqq9_proxyno"); + e.getFieldKeys().add("tqq9_entry.tqq9_e_supno"); } @Override @@ -71,7 +74,7 @@ public class WmsZczSyncOpPlugin extends AbstractOperationServicePlugIn { new QFilter[]{new QFilter("number", QFilter.equals, number2)}); String MFCode = file2.getString("number"); String name = file2.getString("name"); - String ProLicenceCode = file2.getString("tqq9_prolicense"); + String ProLicenceCode = entry.getString("tqq9_e_supno"); String tqq9_type = file2.getString("tqq9_type");//厂商类型 if (StringUtils.isNotEmpty(tqq9_type) && tqq9_type.contains("B")) { map.put("isAgent", "Y");//代理商 @@ -84,6 +87,22 @@ public class WmsZczSyncOpPlugin extends AbstractOperationServicePlugIn { manufactoryArray.add(map); } } + String tqq9_type = dataEntity.getString("tqq9_type"); + //进口 A 显示总代 + if ("A".equals(tqq9_type)) { + HashMap map = new HashMap<>(); + DynamicObject tqq9_proxy = dataEntity.getDynamicObject("tqq9_proxy");//总代 + if (null != tqq9_proxy) { + String MFCode = tqq9_proxy.getString("number"); + String name = tqq9_proxy.getString("name"); + map.put("manufactoryCode", MFCode); + map.put("manufactoryName", name); + map.put("isAgent", "Y");//代理商 + } + String tqq9_proxyno = dataEntity.getString("tqq9_proxyno");//总代许可证号 + map.put("proLicenceCode", tqq9_proxyno); + manufactoryArray.add(map); + } manufactoryList.put("manufactory", manufactoryArray); //获取url路径信息 List> urlPathsArray = new ArrayList<>();