diff --git a/erp-hyc-interfaces-backend/pom.xml b/erp-hyc-interfaces-backend/pom.xml
index aca46a271d0ceb86b9db3b65b86a4245149d3b2e..265927cbbcf2303cee30a418718050866aaa27c1 100644
--- a/erp-hyc-interfaces-backend/pom.xml
+++ b/erp-hyc-interfaces-backend/pom.xml
@@ -91,6 +91,12 @@
             <artifactId>joda-time</artifactId>
             <version>2.9.9</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>21.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallOrderByHYCServiceImpl.java b/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallOrderByHYCServiceImpl.java
index f91177a5a5d7b812af04ad89c66ec6e6bf1d5f95..5d272fd39ff43d17c561cc982d76a574603ad81b 100644
--- a/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallOrderByHYCServiceImpl.java
+++ b/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallOrderByHYCServiceImpl.java
@@ -1,6 +1,5 @@
 package com.unlcn.erp.hyc.interfaces.backend.service;
 
-import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.unlcn.erp.hyc.interfaces.backend.bo.HYCOrderDB;
 import com.unlcn.erp.hyc.interfaces.backend.bo.OrderCodesDB;
@@ -10,6 +9,7 @@ import com.unlcn.erp.hyc.interfaces.base.mapper.HycbackMapper;
 import com.unlcn.erp.hyc.interfaces.base.mapper.HycorderMapper;
 import com.unlcn.erp.hyc.interfaces.base.mapper.SoorderMapper;
 import com.unlcn.erp.hyc.interfaces.base.model.*;
+import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -192,6 +192,7 @@ public class CallOrderByHYCServiceImpl implements CallOrderByHYCService{
                 soorder.setVcuserno("system");
             }else {
                 soorder.setVcuserno(db.getUsername());
+                soorder.setVcreceiveduty(db.getUsername());
             }
             soorder.setDtdate(db.getCreatetime());
             soorder.setVcaddress(db.getDepartaddr());
@@ -275,6 +276,8 @@ public class CallOrderByHYCServiceImpl implements CallOrderByHYCService{
                 LOGGER.error("该订单好现金标记为NULL："+db.getOrdercode());
             }
             soorder.setDcpay(db.getCost());
+
+
             /** 如果在慧运车中做收款，则打开
             if(db.getPaystatus() == 30){ //10, "未支付",20, "待支付",30, "已支付"
                 soorder.setDcpayed(db.getCost());
diff --git a/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallWayBillByHYCServiceImpl.java b/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallWayBillByHYCServiceImpl.java
index c1fa1e9b17667e816f805b78db87d57f6aa20851..4a17b1faa8cb5fef00bfc9bb3a3291187982b91b 100644
--- a/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallWayBillByHYCServiceImpl.java
+++ b/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallWayBillByHYCServiceImpl.java
@@ -1,7 +1,6 @@
 package com.unlcn.erp.hyc.interfaces.backend.service;
 
-import com.alibaba.dubbo.common.utils.CollectionUtils;
-import com.alibaba.dubbo.common.utils.StringUtils;
+
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Maps;
 import com.unlcn.erp.hyc.interfaces.backend.bo.HYCWayBillDB;
@@ -10,11 +9,13 @@ import com.unlcn.erp.hyc.interfaces.backend.bo.OrderCodesDB;
 import com.unlcn.erp.hyc.interfaces.backend.enums.CallHYCUrlTypeEnum;
 import com.unlcn.erp.hyc.interfaces.base.mapper.*;
 import com.unlcn.erp.hyc.interfaces.base.model.*;
+import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import java.math.BigDecimal;
 import java.util.*;
@@ -442,9 +443,11 @@ public class CallWayBillByHYCServiceImpl implements CallWayBillByHYCService{
             if(startCity.getVccityname().equals(soorder.getVcstartcity()) && endCity.getVccityname().equals(soorder.getVccityname())){
                 if("中联物流自有车队".equals(db.getCarriername()) || db.getCarrierid() == 151){
                     soorder.setIsdispatch((short)1);
+                    soorder.setDcshipedqty((short)1);
                     soorder.setHycwaybillcode(hycwaybilldetail.getWaybillcode());
                 }else{
                     soorder.setIsdispatch((short)0);
+                    soorder.setDcshipedqty((short)1);
                 }
                 soorderMapper.updateDispatchByPrimaryKey(soorder);
                 return iorderId;
@@ -478,9 +481,11 @@ public class CallWayBillByHYCServiceImpl implements CallWayBillByHYCService{
 
         if("中联物流自有车队".equals(db.getCarriername()) || db.getCarrierid() == 151){
             soorder.setIsdispatch((short)1);
+            soorder.setDcshipedqty((short)0);
             soorder.setHycwaybillcode(hycwaybilldetail.getWaybillcode());
         }else{
             soorder.setIsdispatch((short)0);
+            soorder.setDcshipedqty((short)0);
         }
 
         SoorderExample example = new SoorderExample();
diff --git a/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CheckIntermediateServiceImpl.java b/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CheckIntermediateServiceImpl.java
index cb7f14920aed66c2be3153f0fbe51b56aa240ca6..f7522f73979b8b989e451b9df4d2b074faf1622a 100644
--- a/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CheckIntermediateServiceImpl.java
+++ b/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CheckIntermediateServiceImpl.java
@@ -1,9 +1,10 @@
 package com.unlcn.erp.hyc.interfaces.backend.service;
 
-import com.alibaba.dubbo.common.utils.CollectionUtils;
+
 import com.unlcn.erp.hyc.interfaces.backend.enums.ExceptionMsgTypeEnum;
 import com.unlcn.erp.hyc.interfaces.base.mapper.*;
 import com.unlcn.erp.hyc.interfaces.base.model.*;
+import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/erp-hyc-interfaces-base/src/main/resources/mappers/SoorderMapper.xml b/erp-hyc-interfaces-base/src/main/resources/mappers/SoorderMapper.xml
index 9b5454efab44fbc9b4ed0775d8bcb6fe93c25dbb..5c17c17f2bcea8348036a5ae2361e1416d3d4510 100644
--- a/erp-hyc-interfaces-base/src/main/resources/mappers/SoorderMapper.xml
+++ b/erp-hyc-interfaces-base/src/main/resources/mappers/SoorderMapper.xml
@@ -1373,7 +1373,9 @@
   </select>
 
   <update id="updateDispatchByPrimaryKey"  parameterType="com.unlcn.erp.hyc.interfaces.base.model.Soorder">
-    update SOORDER set ISDISPATCH = #{isdispatch,jdbcType=DECIMAL},HYCWAYBILLCODE = #{hycwaybillcode,jdbcType=VARCHAR} where ilineid =  #{ilineid,jdbcType=DECIMAL}
+    update SOORDER set ISDISPATCH = #{isdispatch,jdbcType=DECIMAL},HYCWAYBILLCODE = #{hycwaybillcode,jdbcType=VARCHAR},
+    DCSHIPEDQTY = #{dcshipedqty}
+    where ilineid =  #{ilineid,jdbcType=DECIMAL}
   </update>
 
   <update id="updateSoorderByHYC" parameterType="com.unlcn.erp.hyc.interfaces.base.model.Soorder">
@@ -1444,6 +1446,7 @@
 
   <update id="updateSaveSoorderByHYC" parameterType="com.unlcn.erp.hyc.interfaces.base.model.Soorder">
     update SOORDER set IPAYID = #{ipayid,jdbcType=DECIMAL},DCPAY = #{dcpay,jdbcType=DECIMAL},DCPAYED = #{dcpayed,jdbcType=DECIMAL},
+
     <if test="ipayid2 != null">
       IPAYID2 = #{ipayid2,jdbcType=DECIMAL},
     </if>