单证同步新 修改

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

@@ -139,7 +139,7 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
                         " LEFT JOIN Customer cc ON s.cCusCode = cc.cCusCode" +
                         " LEFT JOIN Person  pe ON s.cPersonCode = pe.cPersonCode" +
                         " left join Vendor v on s.cDefine12=v.cVenName" +
-                        " where s.iStatus = 1  AND s.cdefine11 !=1 ";//and s.dverifysystime > '"+lastTimeSf+"'
+                        " where s.iStatus = 1  AND s.cdefine11 !='1' ";//order by s.dDate desc and s.dverifysystime > '"+lastTimeSf+"'
                 List<Map<String, Object>> list = new ArrayList<>();
                 if(pkorgValue[0].equals("one")){
                     list = senYuDataSourceOne.queryForList(sql);
@@ -184,7 +184,7 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
                         "s.cMemo AS remarks ," +
                         "d.cComUnitName as masterMetering," +
                         "c.cInvStd as specificationAndModel," +
-                        "case when c.cInvDefine14 is null then 1 else cInvDefine14 end as numberOfSets"+
+                        "case when c.cInvDefine14 is null then 1 else cInvDefine14 end as numberOfSets,"+
                         "s.cSCloser as bankClosedBy," +
                         "be.cbdefine2 as ymoney"+
                         " FROM" +
@@ -206,19 +206,25 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
                     SyOrderDataItem sy2 = JSONObject.toJavaObject(Object, SyOrderDataItem.class);
                     sy2.setId(sy.getAccount()+sy2.getId());
                     sy2.setSyOrderDataId(sy.getAccount()+sy2.getSyOrderDataId());
-                    SyOrderDataVO ordervo = queryOrder(sy2.getSyOrderDataId());
+                    SyOrderDataVO ordervo = queryOrder(sy2.getId());
                     if(ordervo != null){
                         sy2.setOmpoAccount(ordervo.getOmpoAccount());
                         sy2.setOmpoCode(ordervo.getOmpoCode());
                         sy2.setOmpoId(ordervo.getOmpoId());
                         sy2.setOmpoIdItem(ordervo.getOmpoIdItem());
                         sy2.setITaxPrice(ordervo.getITaxPrice());
-                        sy2.setGuangpeiGateWidth(ordervo.getGuangpeiGateWidth().toString());
+                        sy2.setGuangpeiGateWidth(ordervo.getGuangpeiGateWidth());
                         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));
+                    if(sy2.getSupplier()!=null && sy.getAccount()!=null){
+                        List<String> rsup = queryRSupplier(sy.getId(),sy.getAccount());
+                        if(rsup.size()>0){
+                            sy2.setRSupplierCode(rsup.get(0));
+                            sy2.setRSupplier(rsup.get(1));
+                        }
+                    }
+
                     syOrderDataItemService.save(sy2);
                 }
                 //添加主表数据进入数据库
@@ -286,9 +292,11 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
         }
         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());
+        if(jSONObject.size()>0){
+            for (JSONObject json:jSONObject) {
+                result.add(json.get("cVenCode").toString());
+                result.add(json.get("cVenName").toString());
+            }
         }
         return result;
     }
@@ -297,7 +305,7 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
     /*
    查询数据
     */
-    public SyOrderDataVO queryOrder(String orderItemID){
+    public SyOrderDataVO queryOrder(String orderItemID) throws Exception{
         SyOrderDataVO syOrderDataVO = new SyOrderDataVO();
         syOrderDataVO.setId(orderItemID);
         List<Map<String, Object>> listSon = new ArrayList<>();
@@ -364,6 +372,9 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
             for (JSONObject jsonObject:jian) {
                 result = JSONObject.toJavaObject(jsonObject, SyOrderDataVO.class);
             }
+            if(result.getSupplier()==null){
+                return result;
+            }
             if(!result.getSupplier().equals("马菲羊")){
                 return result;
             }