销售订单 删除 手工匹配

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/controller/SySOAndOMController.java

@@ -66,7 +66,7 @@ public class SySOAndOMController extends JeecgController<SySOAndOM, ISySOAndOMSe
             return Result.error("请选择订单！！！");
         }
         String mess = syOrderDataService.queryIDBYOrderNumber(orderNumber,account);
-        if(mess.equals("已被参照")){
+        if(mess!=null && mess.equals("已被参照")){
             return Result.error("数据已被下游参照！！！");
         }
         sySOAndOMService.delOrderItem(orderNumber);
@@ -171,6 +171,8 @@ public class SySOAndOMController extends JeecgController<SySOAndOM, ISySOAndOMSe
                     syOrderDataItem.setRSupplier(rsup.get(1));
                 }
             }
+            syOrderDataItem.setId(syOrderData.getAccount()+syOrderDataItem.getId());
+            syOrderDataItem.setSyOrderDataId(syOrderData.getAccount()+syOrderDataItem.getSyOrderDataId());
             syOrderDataItemService.save(syOrderDataItem);
         }
         syOrderData.setFlag(1);