面辅料批量删除

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

@@ -487,16 +487,14 @@ public class SyPackingListFabricController {
 	@ApiOperation(value="装箱单-面辅料-批量删除", notes="装箱单-面辅料-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		long startTime = System.currentTimeMillis();
+		/*long startTime = System.currentTimeMillis();
 		List<String> listIds=new ArrayList<>();
 		List<SyPackingListFabric> items=syPackingListFabricService.list();
 		for (SyPackingListFabric item : items){
 			listIds.add(item.getId());
-		}
+		}*/
 		//this.syPackingListFabricService.delBatchMain(Arrays.asList(ids.split(",")));
-		this.syPackingListFabricService.delBatchMain(listIds);
-		long endTime = System.currentTimeMillis();
-		System.out.println("删除数据的时间：" + (endTime - startTime) + "ms");
+		this.syPackingListFabricService.delBatchMain(Arrays.asList(ids));
 		return Result.OK("批量删除成功！");
 	}
 	

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

@@ -313,7 +313,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			SyPackingListFabricItem item2=mapItems3.get(item.getId());
 			BigDecimal shipmentQuantity=item.getShipmentQuantity();//获取发货数量
 			BigDecimal actualDeclaredQuantity=item2.getActualDeclaredQuantity();//现在数量
-			if(item2.getMasterMetering().equals("KG")){
+			if(item2.getMasterMetering()!=null&&item2.getMasterMetering().equals("KG")){
 				actualDeclaredQuantity=item2.getNetWeight();
 			}
 			BigDecimal remainingQuantity=shipmentQuantity.subtract(actualDeclaredQuantity);//剩余数量
@@ -496,7 +496,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			}
 			if(maps.containsKey(item.getSyShippingDetailsItemId())){
 				SyPackingListFabricItem item1=maps.get(item.getSyShippingDetailsItemId());
-				if(item.getMasterMetering().equals("KG")){
+				if(item.getMasterMetering()!=null&&item.getMasterMetering().equals("KG")){
 					item1.setNetWeight(item.getNetWeight());
 					maps.put(item.getSyShippingDetailsItemId(),item1);
 					//updateQuantity(item.getNetWeight().negate(),item.getSyShippingDetailsItemId(),item.getMasterMetering());
@@ -507,7 +507,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				}
 			}else{
 				idItems.add(item.getSyShippingDetailsItemId());
-				if(item.getMasterMetering().equals("KG")){
+				if(item.getMasterMetering()!=null&&item.getMasterMetering().equals("KG")){
 					maps.put(item.getSyShippingDetailsItemId(),item);
 					//updateQuantity(item.getNetWeight().negate(),item.getSyShippingDetailsItemId(),item.getMasterMetering());
 				}else{