单证同步新 添加染厂供应商

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/entity/SyOrderDataItem.java

@@ -207,6 +207,14 @@ public class SyOrderDataItem {
 	@ApiModelProperty(value = "佣金")
 	private java.math.BigDecimal ymoney;
 
+	@Excel(name = "染厂供应商编码", width = 15)
+	@ApiModelProperty(value = "染厂供应商编码")
+	private java.lang.String rSupplierCode;
+
+	@Excel(name = "染厂供应商", width = 15)
+	@ApiModelProperty(value = "染厂供应商")
+	private java.lang.String rSupplier;
+
 	@Excel(name = "套装件数", width = 15)
 	@ApiModelProperty(value = "套装件数")
 	private java.math.BigDecimal numberOfSets;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/service/impl/SyOrderDataServiceImpl.java

@@ -217,6 +217,8 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
                         sy2.setSupplier(ordervo.getSupplier());
                         sy2.setSupplierCode(ordervo.getSupplierCode());
                     }
+                    sy2.setRSupplierCode(queryRSupplier(sy2.getSupplier(),sy.getAccount()).get(0));
+                    sy2.setRSupplier(queryRSupplier(sy2.getSupplier(),sy.getAccount()).get(1));
                     syOrderDataItemService.save(sy2);
                 }
                 //添加主表数据进入数据库
@@ -232,6 +234,65 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
         return result;
     }
 
+    /*
+    * 查询染厂供应商编码 供应商名称
+    * */
+    public List<String>  queryRSupplier(String id,String zhangtao){
+        /*
+        查询账套用于判断
+         */
+        QueryWrapper<DxpDataPlan> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("code", "senYu_syOrder");
+        List<DxpDataPlan> pageList = dxpDataPlanService.list(queryWrapper);
+        String pkorg = pageList.get(0).getPkOrg();
+        String pkorgSplit[] = pkorg.split(",");
+        //定义账套集合
+        String account[] = new String[3];
+        int index = 0;
+        //得到对应的账套
+        for (String str : pkorgSplit) {
+            String pkorgValue[] = str.split(":");
+            account[index] = pkorgValue[1];
+            index++;
+        }
+
+        String sql = "select om.cVenCode as cVenCode,v.cVenName as cVenName From OM_MODetails  o " +
+                "join ( " +
+                " select ommos.isosid,ommom.cInvCode from  " +
+                " OM_MODetails ommos  " +
+                "left join OM_MOMaterials ommom on ommom.MoDetailsID=ommos.MODetailsID  " +
+                "where ommos.MODetailsID = '"+id+"' " +
+                ")tab on tab.isosid=o.isosid and tab.cInvCode =o.cInvCode  " +
+                "left join OM_MOMain om on om.moid=o.moid " +
+                "LEFT JOIN Vendor v ON om.cVenCode=v.cVenCode " +
+                "union " +
+                "select om.cVenCode as cVenCode,v.cVenName as cVenName From PO_Podetails  o " +
+                "join ( " +
+                " select ommos.isosid,ommom.cInvCode from  " +
+                " OM_MODetails ommos  " +
+                "left join OM_MOMaterials ommom on ommom.MoDetailsID=ommos.MODetailsID  " +
+                "where ommos.MODetailsID = '"+id+"' " +
+                ")tab on tab.isosid=o.isosid and tab.cInvCode =o.cInvCode  " +
+                "left join PO_Pomain om on om.POID=o.POID " +
+                "LEFT JOIN Vendor v ON om.cVenCode=v.cVenCode";
+
+        List<Map<String, Object>> list = new ArrayList<>();
+        if(zhangtao.equals(account[0])){
+            list = senYuDataSourceOne.queryForList(sql);
+        }else if(zhangtao.equals(account[1])){
+            list = senYuDataSourceTwo.queryForList(sql);
+        }else if(zhangtao.equals(account[2])){
+            list = senYuDataSourceThree.queryForList(sql);
+        }
+        List<JSONObject> jSONObject = JsonChangeUtils.toJSONObject(list);
+        List<String> result = new ArrayList<>();
+        for (JSONObject json:jSONObject) {
+            result.add(json.get("cVenCode").toString());
+            result.add(json.get("cVenName").toString());
+        }
+        return result;
+    }
+
 
     /*
    查询数据