Merge remote-tracking branch 'origin/ScrmStores' into ScrmStores

fs-store/src/main/java/com/fs/hisStore/controller/store/FsStoreOrderScrmController.java

@@ -566,9 +566,9 @@ public class FsStoreOrderScrmController extends BaseController
                 setCellValue(sheet, 15, startCol + i, String.valueOf(cartInfo.getPrice()));//金额（元）
                 FsStoreProductScrm fsStoreProductScrm = fsStoreProductService.selectFsStoreProductById(cartInfo.getProductId());
                 setCellValue(sheet, 10, startCol + i, fsStoreProductScrm != null && fsStoreProductScrm.getManufacturer()!= null ?fsStoreProductScrm.getManufacturer(): "");//生产企业名称
-                setCellValue(sheet, 8, startCol + i, cartInfo.getProductName() == null ? fsStoreProductScrm != null && fsStoreProductScrm.getCommonName()!= null ?fsStoreProductScrm.getCommonName() : cartInfo.getProductName():"");//商品名称
-                setCellValue(sheet, 11, 1, orderItems.get(i).getBatchNumber());//生产批号(药品) / 序列号(器械)
-                setCellValue(sheet, 12, 1, orderItems.get(i).getVerifyCode());//有效期/追溯码
+                setCellValue(sheet, 8, startCol + i, cartInfo.getProductName() != null && !"-".equals(cartInfo.getProductName()) ? cartInfo.getProductName() : (fsStoreProductScrm != null && fsStoreProductScrm.getCommonName() != null ? fsStoreProductScrm.getCommonName() : ""));//商品名称
+                setCellValue(sheet, 11, startCol + i, orderItems.get(i).getBatchNumber());//生产批号(药品) / 序列号(器械)
+                setCellValue(sheet, 12, startCol + i, orderItems.get(i).getVerifyCode());//有效期/追溯码
             }
             String payTimeStr = null;
             Date payTime = fsStoreOrderScrm.getPayTime();