| 
														
															@@ -1648,11 +1648,17 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                     if(productGroupDTOS!=null){ 
														 | 
														
														 | 
														
															                     if(productGroupDTOS!=null){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                         for(StoreProductGroupDTO dto:productGroupDTOS){ 
														 | 
														
														 | 
														
															                         for(StoreProductGroupDTO dto:productGroupDTOS){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                             FsStoreProductAttrValue attrValue=attrValueService.selectFsStoreProductAttrValueById(dto.getId()); 
														 | 
														
														 | 
														
															                             FsStoreProductAttrValue attrValue=attrValueService.selectFsStoreProductAttrValueById(dto.getId()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                             ErpOrderItem item=new ErpOrderItem(); 
														 | 
														
														 | 
														
															                             ErpOrderItem item=new ErpOrderItem(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                             item.setItem_code(attrValue.getBarCode()); 
														 | 
														
														 | 
														
															                             item.setItem_code(attrValue.getBarCode()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                             item.setPrice(attrValue.getPrice().toString()); 
														 | 
														
														 | 
														
															                             item.setPrice(attrValue.getPrice().toString()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                             item.setQty(dto.getCount()*cartDTO.getNum()); 
														 | 
														
														 | 
														
															                             item.setQty(dto.getCount()*cartDTO.getNum()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                             item.setRefund(0); 
														 | 
														
														 | 
														
															                             item.setRefund(0); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                            // 查询仓库代码 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                            FsStoreProduct fsStoreProduct = productService.selectFsStoreProductById(dto.getProductId()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                            if(ObjectUtil.isNotNull(fsStoreProduct)){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                                item.setWarehouseCode(fsStoreProduct.getWarehouseCode()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                            } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                             details.add(item); 
														 | 
														
														 | 
														
															                             details.add(item); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                         } 
														 | 
														
														 | 
														
															                         } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                     } 
														 | 
														
														 | 
														
															                     } 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -1663,6 +1669,8 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 item.setItem_code(cartDTO.getBarCode().trim()); 
														 | 
														
														 | 
														
															                 item.setItem_code(cartDTO.getBarCode().trim()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 item.setPrice(cartDTO.getPrice().toString()); 
														 | 
														
														 | 
														
															                 item.setPrice(cartDTO.getPrice().toString()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 item.setQty(cartDTO.getNum()); 
														 | 
														
														 | 
														
															                 item.setQty(cartDTO.getNum()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                // 仓库代码 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                item.setWarehouseCode(cartDTO.getWarehouseCode()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 item.setRefund(0); 
														 | 
														
														 | 
														
															                 item.setRefund(0); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 details.add(item); 
														 | 
														
														 | 
														
															                 details.add(item); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             } 
														 | 
														
														 | 
														
															             } 
														 |