优化

hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/vo/SaleOrderRespVO.java

@@ -65,6 +65,9 @@ public class SaleOrderRespVO {
     @ExcelProperty("总金额")
     private BigDecimal orderAmount;
 
+    @Schema(description = "物流单号")
+    @ExcelProperty("物流单号")
+    private String logisticsCode;
 
     @Schema(description = "业务日期")
     @ExcelProperty("业务日期")

hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/convert/saleorder/SaleOrderConvert.java

@@ -35,7 +35,8 @@ public interface SaleOrderConvert {
             @Mapping(source = "brandId", target = "brandId"),
             @Mapping(source = "saleContractCode", target = "saleContractCode"),
             @Mapping(source = "totalQty", target = "totalQty"),
-            @Mapping(source = "orderAmount", target = "orderAmount")
+            @Mapping(source = "orderAmount", target = "orderAmount"),
+            @Mapping(source = "logisticsCode", target = "logisticsCode")
     })
     SaleOrderRespVO convert(SaleOrderDO bean);
 

hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java

@@ -862,6 +862,24 @@ public class SaleOrderServiceImpl implements SaleOrderService {
                 mailSendService.doSendMail(message);
             }
         }
+
+        String emails = order.getEmails();
+        if (StringUtils.isNotBlank(emails) && customerDO != null) {
+            // 获取跟单员 给跟单员发邮件
+            List<String> emailList = FuncUtil.toStrList(";", emails);
+            for (String email : emailList) {
+                MailSendMessage message = new MailSendMessage();
+                message.setAccountId(1L);
+                message.setMail(email);
+                //message.setMail("782276617@qq.com");
+                message.setTitle("OMS订单系统");
+                //StringBuffer content = new StringBuffer();
+                //content.append("您好，客户：【" + customerDO.getName() + "】 来新的订单啦，订单号：" + order.getBillno() + "，下单时间：" + createTimestr + " 请进行处理！");
+                String htmlcontent = generateMailSendHtmlContent(order, entryList);
+                message.setContent(htmlcontent);
+                mailSendService.doSendMail(message);
+            }
+        }
         return order.getId();
     }
 

hangtag-ui/hangtag-ui-admin/src/api/oms/saleorder/index.ts

@@ -20,6 +20,7 @@ export interface SaleOrderVO {
   contractType: string // 合约类型
   currencyType: string // 结算币种
   saleContractCode: string // 销售合约号
+  logisticsCode: string // 销售合约号
   totalQty: number // 总数量
   totalAmount: number // 总金额
 }

hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/detail/index.vue

@@ -79,6 +79,7 @@
       <el-descriptions-item label="结算币种: " v-else >{{ formData.currencyType }}</el-descriptions-item>
       <el-descriptions-item label="总数量: ">{{ formData.totalQty }}</el-descriptions-item>
       <el-descriptions-item label="总金额: ">{{ formData.orderAmount }}</el-descriptions-item>
+      <el-descriptions-item label="物流单号: ">{{ formData.logisticsCode }}</el-descriptions-item>
       <el-descriptions-item label="订单备注: ">{{ formData.remark }}</el-descriptions-item>
     </el-descriptions>
 

hangtag-ui/hangtag-ui-front/src/api/oms/saleorder/index.ts

@@ -16,6 +16,7 @@ export interface SaleOrderVO {
   address: string // 地址
   currency: string // 货币
   invoiceRemarks: string // 发票备注
+  logisticsCode: string // 物流单号
   totalQty: number // 总数量
   totalAmount: number // 总金额
 }

hangtag-ui/hangtag-ui-front/src/locales/en.ts

@@ -526,6 +526,7 @@ export default {
     },
     billno:'orderNo',
     customer:'customer',
+    logisticsCode:'logisticsCode',
     brand:'brand',
     salesperson:'salesPerson',
     followUpPerson:'followUpPerson',

hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts

@@ -521,6 +521,7 @@ export default {
     },
     billno:'订单号',
     customer:'客户',
+    logisticsCode:'物流单号',
     brand:'品牌',
     salesperson:'销售员',
     followUpPerson:'跟单员',

hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/detail/index.vue

@@ -30,6 +30,7 @@
       <el-descriptions-item :label="t('saleorder.currencyType')+':'">{{ formData.currencyType }}</el-descriptions-item>
       <el-descriptions-item :label="t('saleorder.totalQty')+':'">{{ formData.totalQty }}</el-descriptions-item>
       <el-descriptions-item :label="t('saleorder.orderAmount')+':'">{{ formData.orderAmount }}</el-descriptions-item>
+      <el-descriptions-item :label="t('saleorder.logisticsCode')+':'">{{ formData.logisticsCode }}</el-descriptions-item>
       <el-descriptions-item :label="t('saleorder.remark')+':'">{{ formData.remark }}</el-descriptions-item>
     </el-descriptions>