优化

hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/deliveryorder/vo/DeliveryOrderPageReqVO.java

@@ -51,6 +51,9 @@ public class DeliveryOrderPageReqVO extends PageParam {
     @Schema(description = "客户名称", example = "6168")
     private String customerName;
 
+    @Schema(description = "跟单员")
+    private String gdPersonName;
+
     @Schema(description = "业务员id")
     private String salesPersonIds;
 

hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/deliveryorder/vo/DeliveryOrderRespVO.java

@@ -72,6 +72,10 @@ public class DeliveryOrderRespVO {
     @ExcelProperty("客户ID数组")
     private Long customerId;
 
+    @Schema(description = "跟单员")
+    @ExcelProperty("跟单员")
+    private String gdPersonName;
+
     @Schema(description = "业务员id")
     @ExcelProperty("业务员id")
     private String salesPersonIds;

hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/deliveryorder/vo/DeliveryOrderSaveReqVO.java

@@ -61,6 +61,9 @@ public class DeliveryOrderSaveReqVO {
     @Schema(description = "客户ID数组", example = "6168")
     private Long customerId;
 
+    @Schema(description = "跟单员")
+    private String gdPersonName;
+
     @Schema(description = "业务员id")
     private String salesPersonIds;
 

hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/deliveryorder/DeliveryOrderDO.java

@@ -4,7 +4,12 @@ import cn.hangtag.framework.mybatis.core.dataobject.BaseDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -87,6 +92,12 @@ public class DeliveryOrderDO extends BaseDO {
      * 客户ID数组
      */
     private Long customerId;
+
+    /**
+     * 跟单员
+     */
+    private String gdPersonName;
+
     /**
      * 业务员id
      */

hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/deliveryorder/DeliveryOrderServiceImpl.java

@@ -332,7 +332,8 @@ public class DeliveryOrderServiceImpl implements DeliveryOrderService {
                 }
             }
         }
-        context.setVariable("personText", personText.toString());//负责人
+        //context.setVariable("personText", personText.toString());//负责人
+        context.setVariable("personText", deliveryOrder.getGdPersonName());//负责人
         //context.setVariable("totalQty", deliveryOrder.getTotalQty());//总数量
         context.setVariable("totalQty", "             ");//总数量
         context.setVariable("logisticsCode", deliveryOrder.getLogisticsCode());//物流单号

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

@@ -1831,8 +1831,8 @@ public class SaleOrderServiceImpl implements SaleOrderService {
             if(customer!=null){
                 deliveryOrderDO.setTel(customer.getPhone());
             }
-            //deliveryOrderDO.setSalesPersonIds(saleOrderDO.getOrderFollowerUser());
-            deliveryOrderDO.setSalesPersonIds(customer.getGdperson());
+            deliveryOrderDO.setSalesPersonIds(saleOrderDO.getOrderFollowerUser());
+            deliveryOrderDO.setGdPersonName(customer.getGdperson());
             deliveryOrderDO.setLogisticsCompany(logisticsCompany);
             deliveryOrderDO.setLogisticsCode(logisticsCode);
             deliveryOrderDO.setAddress(saleOrderDO.getAddress());

hangtag-ui/hangtag-ui-admin/src/views/oms/deliveryorder/DeliveryOrderForm.vue

@@ -59,9 +59,14 @@
 <!--      <el-form-item label="业务员id" prop="salesPersonIds">
         <el-input v-model="formData.salesPersonIds" placeholder="请输入业务员id" />
       </el-form-item>-->
+<!--
       <el-form-item label="业务员" prop="salesPersonNames">
         <el-input v-model="formData.salesPersonNames" placeholder="" />
       </el-form-item>
+-->
+      <el-form-item label="负责人" prop="gdPersonName">
+        <el-input v-model="formData.gdPersonName" placeholder="" />
+      </el-form-item>
 
       <el-form-item label="客户采购编号" prop="customerPurNo">
         <el-input v-model="formData.customerPurNo" placeholder="" />
@@ -114,6 +119,7 @@ const formData = ref({
   customerId: undefined,
   salesPersonIds: undefined,
   salesPersonNames: undefined,
+  gdPersonName: undefined,
   customerPurNo: undefined,
   saleContractNo: undefined
 })
@@ -199,6 +205,7 @@ const resetForm = () => {
     customerId: undefined,
     salesPersonIds: undefined,
     salesPersonNames: undefined,
+    gdPersonName: undefined,
     customerPurNo: undefined,
     saleContractNo: undefined
   }