预装箱单回写剩余数量

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/service/impl/SyPreAssembledPackingListServiceImpl.java

@@ -163,12 +163,12 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 				queryWrapperCount.eq("del_Flag","0");
 				queryWrapperCount.eq("sy_Declaration_Elements_Item_Id",item1.getSyDeclarationElementsItemId());
 				BigDecimal total=syPreAssembledPackingListItemMapper.selectOne(queryWrapperCount).getTotal();
-				///发货-预装箱单数量=剩余数量
-				syItem.setSurplusQuantity(syItem.getShipmentQuantity().subtract(total));
-				//预装箱单数量-发货=超发数量
-				syItem.setExcessQuantity(total.subtract(syItem.getShipmentQuantity()));
+				///原剩余数量-预装箱单数量=新剩余数量
+				syItem.setSurplusQuantity(syItem.getSurplusQuantity().subtract(total));
+				//预装箱单数量-剩余数量=超发数量
+				syItem.setExcessQuantity(total.subtract(syItem.getSurplusQuantity()));
 				//标识已被参照
-				//syItem.setIsReference(1);
+				//syItem.setIsReference(1);	由预托书回写
 				syShippingDetailsItemMapper.updateById(syItem);//修改发运明细发货数量和超出数量,如不需要就注释
 				typeConversion(item1);//修改预托书数量
 			}
@@ -233,9 +233,9 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 			//获取发育明细数据
 			SyShippingDetailsItem syItem=syShippingDetailsItemMapper.selectById(item.getSyDeclarationElementsItemId());
 			//发货-预装箱单数量=剩余数量
-			syItem.setSurplusQuantity(syItem.getShipmentQuantity().subtract(total));
+			syItem.setSurplusQuantity(syItem.getSurplusQuantity().subtract(total));
 			//预装箱单数量-发货=超发数量
-			syItem.setExcessQuantity(total.subtract(syItem.getShipmentQuantity()));
+			syItem.setExcessQuantity(total.subtract(syItem.getSurplusQuantity()));
 			syShippingDetailsItemMapper.updateById(syItem);//修改数据
 		}
 		syPreAssembledPackingListItemMapper.deleteByMainId(syPreAssembledPackingList.getId());//将子表的删除状态都变成1
@@ -270,7 +270,8 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 			SyShippingDetailsItem syItem=syShippingDetailsItemMapper.selectById(item.getSyDeclarationElementsItemId());
 			//预装箱单装箱数量-x=剩余数量+x
 			syItem.setSurplusQuantity(syItem.getSurplusQuantity().add(item.getTotal()));
-			syItem.setExcessQuantity(syItem.getSurplusQuantity().subtract(syItem.getShipmentQuantity()));
+			//超发数量=剩余数量-本次删除次数
+			syItem.setExcessQuantity(syItem.getSurplusQuantity().subtract(item.getTotal()));
 			syShippingDetailsItemMapper.updateById(syItem);//修改数据
 		}
 		QueryWrapper queryWrapper=new QueryWrapper();