发运删除调整

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

@@ -163,22 +163,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 	@AutoLog(value = "发运明细主表-通过id删除")
 	@ApiOperation(value="发运明细主表-通过id删除", notes="发运明细主表-通过id删除")
 	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		syShippingDetailsService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-	
-	/**
-	 * 批量删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "发运明细主表-批量删除")
-	@ApiOperation(value="发运明细主表-批量删除", notes="发运明细主表-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<Integer> deleteBatch(@RequestParam(name="id",required=true) String id) {
-
+	public Result<Integer> delete(@RequestParam(name="id",required=true) String id) {
 		Result<Integer> result = new Result<>();
 
 		if(oConvertUtils.isEmpty(id)){
@@ -203,6 +188,41 @@ 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;
+	}
+	
 	/**
 	 * 通过id查询
 	 *