出运明细提交时将已提交数据过滤

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/controller/SyShippingDetailsController.java

@@ -815,16 +815,16 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 
 		  //查询是否已提交
 		  QueryWrapper<SyShippingDetailsItem> itemQueryWrapper = new QueryWrapper<>();
-		  itemQueryWrapper.in("id",idsList);
+		  itemQueryWrapper.in("id",idsList).eq("submit_status","0");
 		  List<SyShippingDetailsItem> list = syShippingDetailsItemService.list(itemQueryWrapper);
 		  if(list.size()!=0){
 			  if(syShippingDetails.getType().equals("1")) {
 				  for (SyShippingDetailsItem li : list) {
-					  if (li.getSubmitStatus() == 1) {
-						  result.setSuccess(false);
-						  result.setMessage("部分单据已提交，请勿重复提交！");
-						  return result;
-					  }
+//					  if (li.getSubmitStatus() == 1) {
+//						  result.setSuccess(false);
+//						  result.setMessage("部分单据已提交，请勿重复提交！");
+//						  return result;
+//					  }
 
 					  //判断是不是辅料数据，如果是不必维护一下内容
 					  String code = li.getInventoryCcode().substring(0,2);
@@ -869,12 +869,16 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 					  count++;
 				  }
 			  }else{
-				  for (SyShippingDetailsItem li : list) {
-					  if (li.getSubmitStatus() == 0) {
-						  result.setSuccess(false);
-						  result.setMessage("部分单据已取消提交，请勿重复取消提交！");
-						  return result;
-					  }
+				  //查询是否已提交
+				  QueryWrapper<SyShippingDetailsItem> itemQueryWrapper1 = new QueryWrapper<>();
+				  itemQueryWrapper1.in("id",idsList).eq("submit_status","1");
+				  List<SyShippingDetailsItem> list1 = syShippingDetailsItemService.list(itemQueryWrapper1);
+				  for (SyShippingDetailsItem li : list1) {
+//					  if (li.getSubmitStatus() == 0) {
+//						  result.setSuccess(false);
+//						  result.setMessage("部分单据已取消提交，请勿重复取消提交！");
+//						  return result;
+//					  }
 					  //判断下游是否有预装箱单-成衣单据
 					  QueryWrapper<SyPreAssembledPackingListItem> queryWrapper = new QueryWrapper<SyPreAssembledPackingListItem>();
 					  queryWrapper.eq("sy_declaration_elements_item_id",li.getId()).eq("del_flag",0);