预装箱单添加查询条件

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

@@ -133,6 +133,9 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
 		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getOrderNumber())){//订单号
 			 queryWrapper.eq("a.order_number",syPreAssembledPackingListVo.getOrderNumber());
 		 }
+		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getGarmentFactory())){//成衣工厂
+			 queryWrapper.eq("b.garment_Factory",syPreAssembledPackingListVo.getGarmentFactory());
+		 }
 		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDocumentNo())){//单据号
 			 queryWrapper.eq("a.document_No",syPreAssembledPackingListVo.getDocumentNo());
 		 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/service/impl/SyPackingListTailoringServiceImpl.java

@@ -90,6 +90,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				SyPreAssembledPackingListItem syPreItem=syPreAssembledPackingListItemMapper.selectById(item.getSyPreAssembledPackingListItemId());//获取预装箱单数据
 				syPreItem.setRemainingQuantity(syPreItem.getRemainingQuantity().subtract(item.getTotal()));//新剩余数量=原剩余数量-装箱单新增数量
 				item1.setSalesman(syPreItem.getSalesman());//获取业务员
+				item1.setOrderNumber(syPreItem.getOrderNumber());//销售订单号
 				item1.setSalesDepartment(syPreItem.getSalesDepartment());//获取业务部门
 				item1.setSpurOrSubOrder(syPreItem.getSpurOrSubOrder());//获取采购委外订单号
 				syPreAssembledPackingListItemMapper.updateById(syPreItem);//修改剩余数量