|  | @@ -220,6 +220,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 | 
											
												
													
														|  |  						item1.setFactoryUnitPrice(syPreItem.getFactoryUnitPrice());//工厂单价
 |  |  						item1.setFactoryUnitPrice(syPreItem.getFactoryUnitPrice());//工厂单价
 | 
											
												
													
														|  |  					}
 |  |  					}
 | 
											
												
													
														|  |  					item1.setPackId(syPreItem.getPackId());//packid
 |  |  					item1.setPackId(syPreItem.getPackId());//packid
 | 
											
												
													
														|  | 
 |  | +					item1.setCustomsDeclarationUnitPrice(syPreItem.getCustomsDeclarationUnitPrice());//报关单价
 | 
											
												
													
														|  |  					item1.setSalesDepartment(syPreItem.getSalesDepartment());//获取业务部门
 |  |  					item1.setSalesDepartment(syPreItem.getSalesDepartment());//获取业务部门
 | 
											
												
													
														|  |  					item1.setSyOrderDataId(syPreItem.getSyOrderDataId());//订单数据主表id
 |  |  					item1.setSyOrderDataId(syPreItem.getSyOrderDataId());//订单数据主表id
 | 
											
												
													
														|  |  					item1.setSyOrderDataItemId(syPreItem.getSyOrderDataItemId());//订单数据子表id
 |  |  					item1.setSyOrderDataItemId(syPreItem.getSyOrderDataItemId());//订单数据子表id
 | 
											
										
											
												
													
														|  | @@ -309,6 +310,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 | 
											
												
													
														|  |  						item1.setFactoryUnitPrice(syPreItem.getFactoryUnitPrice());//工厂单价
 |  |  						item1.setFactoryUnitPrice(syPreItem.getFactoryUnitPrice());//工厂单价
 | 
											
												
													
														|  |  					}
 |  |  					}
 | 
											
												
													
														|  |  					item1.setPackId(syPreItem.getPackId());//packid
 |  |  					item1.setPackId(syPreItem.getPackId());//packid
 | 
											
												
													
														|  | 
 |  | +					item1.setCustomsDeclarationUnitPrice(syPreItem.getCustomsDeclarationUnitPrice());//报关单价
 | 
											
												
													
														|  |  					item1.setSalesDepartment(syPreItem.getSalesDepartment());//获取业务部门
 |  |  					item1.setSalesDepartment(syPreItem.getSalesDepartment());//获取业务部门
 | 
											
												
													
														|  |  					item1.setSyOrderDataId(syPreItem.getSyOrderDataId());//订单数据主表id
 |  |  					item1.setSyOrderDataId(syPreItem.getSyOrderDataId());//订单数据主表id
 | 
											
												
													
														|  |  					item1.setSyOrderDataItemId(syPreItem.getSyOrderDataItemId());//订单数据子表id
 |  |  					item1.setSyOrderDataItemId(syPreItem.getSyOrderDataItemId());//订单数据子表id
 | 
											
										
											
												
													
														|  | @@ -456,6 +458,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 | 
											
												
													
														|  |  				s1.setSpurOrSubOrder(syPreAssembledPackingListItem.getSpurOrSubOrder());//采购委外订单号
 |  |  				s1.setSpurOrSubOrder(syPreAssembledPackingListItem.getSpurOrSubOrder());//采购委外订单号
 | 
											
												
													
														|  |  				s1.setMasterMetering(syPreAssembledPackingListItem.getMasterMetering());//计量单位
 |  |  				s1.setMasterMetering(syPreAssembledPackingListItem.getMasterMetering());//计量单位
 | 
											
												
													
														|  |  				s1.setFactoryUnitPrice(syPreAssembledPackingListItem.getFactoryUnitPrice());//工厂单价
 |  |  				s1.setFactoryUnitPrice(syPreAssembledPackingListItem.getFactoryUnitPrice());//工厂单价
 | 
											
												
													
														|  | 
 |  | +				s1.setCustomsDeclarationUnitPrice(syPreAssembledPackingListItem.getCustomsDeclarationUnitPrice());//报关单价
 | 
											
												
													
														|  |  				s1.setInventoryCcode(syPreAssembledPackingListItem.getInventoryCcode());//物料分类
 |  |  				s1.setInventoryCcode(syPreAssembledPackingListItem.getInventoryCcode());//物料分类
 | 
											
												
													
														|  |  				s1.setWithCode(syPreAssembledPackingListItem.getWithCode());//配码规则
 |  |  				s1.setWithCode(syPreAssembledPackingListItem.getWithCode());//配码规则
 | 
											
												
													
														|  |  				s1.setPackId(syPreAssembledPackingListItem.getPackId());
 |  |  				s1.setPackId(syPreAssembledPackingListItem.getPackId());
 | 
											
										
											
												
													
														|  | @@ -862,6 +865,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 | 
											
												
													
														|  |  							item1.setSalesDepartment(syPreItem.getSalesDepartment());//获取销售部门
 |  |  							item1.setSalesDepartment(syPreItem.getSalesDepartment());//获取销售部门
 | 
											
												
													
														|  |  							item1.setInventoryCode(syPreItem.getInventoryCcode());//存货名称
 |  |  							item1.setInventoryCode(syPreItem.getInventoryCcode());//存货名称
 | 
											
												
													
														|  |  							item1.setSpurOrSubOrder(syPreItem.getSpurOrSubOrder());//获取采购委外订货号
 |  |  							item1.setSpurOrSubOrder(syPreItem.getSpurOrSubOrder());//获取采购委外订货号
 | 
											
												
													
														|  | 
 |  | +							item1.setCustomsDeclarationUnitPrice(syPreItem.getCustomsDeclarationUnitPrice());//报关单价
 | 
											
												
													
														|  |  							item1.setOmpoId(syPreItem.getOmpoId());//主表id
 |  |  							item1.setOmpoId(syPreItem.getOmpoId());//主表id
 | 
											
												
													
														|  |  							item1.setOmpoIdItem(syPreItem.getOmpoIdItem());//子表id
 |  |  							item1.setOmpoIdItem(syPreItem.getOmpoIdItem());//子表id
 | 
											
												
													
														|  |  							item1.setOmpoAccount(syPreItem.getOmpoAccount());//子表id
 |  |  							item1.setOmpoAccount(syPreItem.getOmpoAccount());//子表id
 |