批量删除调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/controller/SyPreAssembledPackingListController.java

@@ -761,9 +761,9 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
     @AutoLog(value = "预装箱单主表-批量删除")
     @ApiOperation(value="预装箱单主表-批量删除", notes="预装箱单主表-批量删除")
     @DeleteMapping(value = "/deleteBatch")
-    public Result<Integer> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+    public Result<Integer> deleteBatch(@RequestParam(name="ids",required=true) String[] ids) {
         Result<Integer> result=new Result<>();
-        List <String> strIds=Arrays.asList(ids.split(","));//将ids分成数组，再转换成集合
+        List <String> strIds=Arrays.asList(ids);//将ids分成数组，再转换成集合
         try{
             if(oConvertUtils.isEmpty(ids)){//判断id是否为空
                 result.setMessage("未获取到id的信息！");

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/controller/SyPackingListFabricController.java

@@ -486,7 +486,7 @@ public class SyPackingListFabricController {
 	@AutoLog(value = "装箱单-面辅料-批量删除")
 	@ApiOperation(value="装箱单-面辅料-批量删除", notes="装箱单-面辅料-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
-	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String[] ids) {
 		/*long startTime = System.currentTimeMillis();
 		List<String> listIds=new ArrayList<>();
 		List<SyPackingListFabric> items=syPackingListFabricService.list();

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/service/impl/SyPackingListFabricServiceImpl.java

@@ -291,8 +291,8 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	@Transactional
 	public void  updateQuantitys(Map<String,SyPackingListFabricItem> mapItems,List<String> ids){
 		QueryWrapper queryWrapper=new QueryWrapper();
-		queryWrapper.eq("del_flag","0");
-		queryWrapper.in("sy_shipping_details_item_id",ids);
+		//queryWrapper.eq("del_flag",0);
+		queryWrapper.in("id",ids);
 		List<SyShippingDetailsItem> items=syShippingDetailsItemMapper.selectList(queryWrapper);//获取面辅料出运明细数据
 		if(items.size()==0){
 			return;
@@ -494,6 +494,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			if(item.getNetWeight()==null){
 				item.setNetWeight(new BigDecimal("0"));
 			}
+			idItems.add(item.getSyShippingDetailsItemId());
 			if(maps.containsKey(item.getSyShippingDetailsItemId())){
 				SyPackingListFabricItem item1=maps.get(item.getSyShippingDetailsItemId());
 				if(item.getMasterMetering()!=null&&item.getMasterMetering().equals("KG")){
@@ -506,7 +507,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					//updateQuantity(item.getActualDeclaredQuantity().negate(),item.getSyShippingDetailsItemId(),item.getMasterMetering());
 				}
 			}else{
-				idItems.add(item.getSyShippingDetailsItemId());
 				if(item.getMasterMetering()!=null&&item.getMasterMetering().equals("KG")){
 					maps.put(item.getSyShippingDetailsItemId(),item);
 					//updateQuantity(item.getNetWeight().negate(),item.getSyShippingDetailsItemId(),item.getMasterMetering());
@@ -516,7 +516,10 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			}
 		}
 		System.out.println("maps.size\t"+maps.size());
-		updateQuantitys(maps,idItems);
+		System.out.println("idItems\t"+idItems);
+		if(idItems.size()>0){
+			updateQuantitys(maps,idItems);
+		}
 		syPackingListFabricItemMapper.deleteByMainIds(ids);
 		syPackingListFabricMapper.deleteByMainIds(ids);
 	}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/controller/SyPackingListTailoringController.java

@@ -491,8 +491,8 @@ public class SyPackingListTailoringController {
 	@AutoLog(value = "装箱单成衣-批量删除")
 	@ApiOperation(value="装箱单成衣-批量删除", notes="装箱单成衣-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
-	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.syPackingListTailoringService.delBatchMain(Arrays.asList(ids.split(",")));
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String[] ids) {
+		this.syPackingListTailoringService.delBatchMain(Arrays.asList(ids));
 		return Result.OK("批量删除成功！");
 	}