出运明细批量删除

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

@@ -377,40 +377,45 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 		return result;
 	}
 	
-//	/**
-//	 * 批量删除
-//	 *
-//	 * @param id
-//	 * @return
-//	 */
-//	@AutoLog(value = "发运明细主表-批量删除")
-//	//@ApiOperation(value="发运明细主表-批量删除", notes="发运明细主表-批量删除")
-//	@DeleteMapping(value = "/deleteBatch")
-//	public Result<Integer> deleteBatch(@RequestParam(name="id",required=true) String id) {
-
-//		Result<Integer> result = new Result<>();
-//
-//		if(oConvertUtils.isEmpty(id)){
-//			throw new JeecgBootException("ID不能为空！");
-//		}
-//		//判断是由有该数据
-//		SyShippingDetails shippingDetails = syShippingDetailsService.getById(id);
-//		if(oConvertUtils.isEmpty(shippingDetails)){
-//			throw new JeecgBootException("未找到该数据！");
-//		}
-//		//判断是否已提交
-//		if(shippingDetails.getState().equals("1")){
-//			throw new JeecgBootException("该单据已提交，不允许删除！");
-//		}
-//
-//		int size = syShippingDetailsService.syShippingDetailsDelete(id);
-//		if(size>0){
-//			result.setSuccess(true);
-//			result.setMessage("删除成功");
-//			result.setResult(size);
-//		}
-//		return null;
-//	}
+	/**
+	 * 批量删除
+	 *
+	 * @param
+	 * @return
+	 */
+	@AutoLog(value = "发运明细主表-批量删除")
+	//@ApiOperation(value="发运明细主表-批量删除", notes="发运明细主表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<Integer> deleteBatch(String ids,String itemId) {
+
+		Result<Integer> result = new Result<>();
+
+		if(oConvertUtils.isEmpty(ids)){
+			throw new JeecgBootException("为获取到勾选数据ID！");
+		}
+
+		String idsSplit[] = ids.split(",");
+		for(String str :idsSplit){
+			List<String> strList = new ArrayList<>();
+
+			String itemIdSplit[] = itemId.split(",");
+			for(String str1 :itemIdSplit){
+				SyShippingDetailsItem shippingDetails = syShippingDetailsItemService.getById(str1);
+				//判断是否已提交
+				if(shippingDetails.getSubmitStatus() == 1){
+					throw new JeecgBootException("部分单据已提交，不允许删除！");
+				}
+				strList.add(str1);
+			}
+
+			syShippingDetailsService.syShippingDetailsDelete(str,strList);
+
+		}
+		result.setSuccess(true);
+		result.setMessage("删除成功");
+		result.setResult(1);
+		return result;
+	}
 	
 	/**
 	 * 通过id查询

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/entity/SyShippingDetails.java

@@ -158,6 +158,9 @@ public class SyShippingDetails {
 	@TableField(exist = false)
 	List<String> grouyIdList;
 
+	//订单主表ID
+	@TableField(exist = false)
+	private List<String> ids;
 	//订单子表ID
 	@TableField(exist = false)
 	private List<String> itemId;