diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
index 6e85d1110..6033ba4fb 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
@@ -257,11 +257,13 @@ public class WaybillOrder  implements Serializable {
 
     //扩展信息-------
 
-    /* 寄件客户客户名称 */
+    /* 客户名称 */
     private String customerName;
 
     // 取件员
     private String takePieceEmployeeName;
+    // 操作员
+    private String operateEmployeeName;
 
     private String sendSiteName;
     // 目的地名称
@@ -278,8 +280,26 @@ public class WaybillOrder  implements Serializable {
     private String printSiteName;
 
     // 销售,回款
-    private String salesmenName;
-    private String payeeName;
+//    private String salesmenName;
+//    private String payeeName;
+
+//    客户名称(月结时候使用): customerName
+//    线路名称:  transLineTypeName
+//    产品类型名称: productTypeName
+//    操作员名称:  operateEmployeeName
+//
+//    收件员名称 : takePieceEmployeeName
+//
+//    派件员名称 : dispatchManName
+//    派件网点名称 : dispatchSiteName
+//
+//    月结账户名称 : customerName
+//    销售联系人名称:salesmen
+//    回款联系人名称: payee
+//
+//    发件网点名称:sendSiteName
+//    目的地名称:destinationName
+//    目的网点名称:dispatchUnderlingSiteName
 
 
     /**
@@ -365,14 +385,16 @@ public class WaybillOrder  implements Serializable {
         voItem.setCustomerName(dbWaybill.getCustomerName());
         voItem.setSendSiteName(dbWaybill.getSendSiteName());
         voItem.setTakePieceEmployeeName(dbWaybill.getTakePieceEmployeeName());
+        voItem.setOperateEmployeeName(dbWaybill.getOperateEmployeeName());
         voItem.setDestinationName(dbWaybill.getDestinationName());
         voItem.setDispatchUnderlingSiteName(dbWaybill.getDispatchUnderlingSiteName());
         voItem.setDispatchSiteName(dbWaybill.getDispatchSiteName());
         voItem.setDispatchManName(dbWaybill.getDispatchManName());
         voItem.setPrintManName(dbWaybill.getPrintManName());
         voItem.setPrintSiteName(dbWaybill.getPrintSiteName());
-        voItem.setSalesmenName(dbWaybill.getSalesmenName());
-        voItem.setPayeeName(dbWaybill.getPayeeName());
+//        voItem.setSalesmenName(dbWaybill.getSalesmenName());
+//        voItem.setPayeeName(dbWaybill.getPayeeName());
+
 
 
 //        voItem.setReceiveCustomerCode(dbWaybill.getReceiveCustomerCode());
diff --git a/emis-biz/src/main/resources/mapper/EmisSpecialCalcWeightMapper.xml b/emis-biz/src/main/resources/mapper/EmisSpecialCalcWeightMapper.xml
index 057256297..e12d8be37 100644
--- a/emis-biz/src/main/resources/mapper/EmisSpecialCalcWeightMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSpecialCalcWeightMapper.xml
@@ -128,4 +128,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+
+
+    <select id="checkUnique" parameterType="EmisSpecialCalcWeight"  resultType="int">
+		select count(1) from  emis_special_calc_weight
+		where del_flag='0'
+           and id = #{id}
+           and prod_code = #{prodCode}
+           and begin_weight = #{beginWeight}
+           and end_weight = #{endWeight}
+           and begin_date = #{beginDate}
+           and end_date = #{endDate}
+
+		limit 1
+	</select>
+
+
+
+
 </mapper>
\ No newline at end of file