单证同步新 同步成衣工厂

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

@@ -215,6 +215,10 @@ public class SyOrderDataItem {
 	@ApiModelProperty(value = "染厂供应商")
 	private java.lang.String rSupplier;
 
+	@Excel(name = "成衣工厂", width = 15)
+	@ApiModelProperty(value = "成衣工厂")
+	private java.lang.String garmentFactory;
+
 	@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,7 +217,11 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
                         sy2.setGuangpeiGateWidth(ordervo.getGuangpeiGateWidth());
                         sy2.setSupplier(ordervo.getSupplier());
                         if(sy2.getInventoryCcode().substring(0,2).equals("09")){
-                            sy.setGarmentFactory(ordervo.getSupplier());
+                            sy2.setGarmentFactory(ordervo.getSupplier());
+                        }else if(sy.getCustomerAbbreviation().equals("森语集团") || sy.getCustomerAbbreviation().equals("宁波森语") ) {
+                            sy2.setGarmentFactory(queryGSupplier(sy.getOrderNumber(),sy.getAccount(),sy.getCustomerCode()));
+                        }else {
+                            sy2.setGarmentFactory(sy.getGarmentFactory());
                         }
                         sy2.setSupplierCode(ordervo.getSupplierCode());
                     }
@@ -261,6 +265,66 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
         return result;
     }
 
+    /*
+     * 查询成衣工厂  （面辅料供应商编码 面辅料供应商名称）
+     * */
+    public String queryGSupplier(String soCode,String zhangtao,String customerCode){
+        /*
+        查询账套用于判断
+         */
+        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 resql = " select max(ss.cSOCode) as soCode from  PO_Podetails t  " +
+                "  left join PO_Pomain m  on m.poid=t.poid " +
+                "  left join SO_SODetails s on s.isosid=t.iorderdid " +
+                " left join SO_SOMain ss on ss.id=s.id " +
+                "  where m.cpoid = '"+soCode+"'";
+
+        List<Map<String, Object>> list = new ArrayList<>();
+        if(zhangtao.equals(account[2]) && customerCode.equals("T020001")){
+            list = senYuDataSourceThree.queryForList(resql);
+            List<JSONObject> jSONObject = JsonChangeUtils.toJSONObject(list);
+            if(jSONObject.size()>0){
+                for (JSONObject json:jSONObject) {
+                    soCode = json.get("soCode").toString();
+                    zhangtao = account[0];
+                }
+            }
+        }
+
+        String sql = "SELECT max(v.cVenName) as cVenName from OM_MOMain m right join OM_MODetails t on m.moid = t.moid " +
+                "  left join Vendor v on m.cVenCode=v.cVenCode " +
+                "  where t.isosid=( select max(s.isosid) from  PO_Podetails t  " +
+                "  left join PO_Pomain m  on m.poid=t.poid " +
+                "  left join SO_SODetails s on s.isosid=t.iorderdid " +
+                "  where m.cpoid = '"+soCode+"') ";
+
+        if(zhangtao.equals(account[0])){
+            list = senYuDataSourceOne.queryForList(sql);
+        }
+        List<JSONObject> jSONObject = JsonChangeUtils.toJSONObject(list);
+        String result = "";
+        if(jSONObject.size()>0){
+            for (JSONObject json:jSONObject) {
+                result=json.get("cVenName").toString();
+            }
+        }
+        return result;
+    }
+
     /*
     * 查询染厂供应商编码 供应商名称
     * */