销售订单 同步逻辑调整

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

@@ -220,8 +220,8 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
                     SyOrderDataItem sy2 = JSONObject.toJavaObject(Object, SyOrderDataItem.class);
                     sy2.setId(sy.getAccount()+sy2.getId());
                     if(isNewOrder){
-                        SyOrderDataItem item = syOrderDataItemService.queryItemMub(sy2.getId());
-                        if(item==null){
+                        String item = syOrderDataItemService.queryItemMub(sy2.getId());
+                        if(item!=null && item.equals("已被参照")){
                             continue;
                         }else {
                             //更新数据前 删除旧数据防止id冲突
@@ -273,7 +273,7 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
                 sy.setId(sy.getAccount()+sy.getId());
 
                 if(!isNewOrder){
-                    if(syItemList.size()<jianSon.size()){
+                    if(syItemList.size()!=jianSon.size()){
                         //回写不拉取的数据状态 0
                         String blackWrite = "UPDATE SO_SOMain SET cdefine15 = '0' WHERE id='"+syId+"'";
                         if(sy.getAccount().equals("901")){

jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/job/AddOrderJob.java

@@ -215,8 +215,8 @@ public class AddOrderJob implements Job,ApplicationContextAware {
                     SyOrderDataItem sy2 = JSONObject.toJavaObject(Object, SyOrderDataItem.class);
                     sy2.setId(sy.getAccount()+sy2.getId());
                     if(isNewOrder){
-                        SyOrderDataItem item = syOrderDataItemService.queryItemMub(sy2.getId());
-                        if(item==null){
+                        String item = syOrderDataItemService.queryItemMub(sy2.getId());
+                        if(item!=null && item.equals("已被参照")){
                             continue;
                         }else {
                             //更新数据前 删除旧数据防止id冲突
@@ -268,7 +268,7 @@ public class AddOrderJob implements Job,ApplicationContextAware {
                 sy.setId(sy.getAccount()+sy.getId());
 
                 if(!isNewOrder){
-                    if(syItemList.size()<jianSon.size()){
+                    if(syItemList.size()!=jianSon.size()){
                         //回写不拉取的数据状态 0
                         String blackWrite = "UPDATE SO_SOMain SET cdefine15 = '0' WHERE id='"+syId+"'";
                         if(sy.getAccount().equals("901")){