修改uv派单，修改发货id

Web/EDelivery/js/ChangeDelivery.js

@@ -391,7 +391,7 @@ function saveDeliveryFn() {
     parms.outSid = $("#txtTransNo").val();
     parms.comCode = mini.get("txtComName").getValue();
     parms.comName = mini.get("txtComName").getText();
-    parms.deliveryMemo = $("#txtDeliveryMemo").val();
+    parms.deliveryMemo = $("#txtdeliveryMemo").val();
 
     postAjax("set_erp_orderdelivery", parms, function (data) {
         mini.get("delivery_win").hide();

Web/EDelivery/js/PddDelivering.js

@@ -471,7 +471,7 @@ function saveDeliveryFn() {
     parms.outSid = $("#txtTransNo").val();
     parms.comCode = mini.get("txtComName").getValue();
     parms.comName = mini.get("txtComName").getText();
-    parms.deliveryMemo = $("#txtDeliveryMemo").val();
+    parms.deliveryMemo = $("#txtdeliveryMemo").val();
 
     postAjax("set_erp_orderdelivery", parms, function (data) {
         mini.get("delivery_win").hide();

Web/EDelivery/js/WaitingDelivery.js

@@ -445,7 +445,7 @@ function saveDeliveryFn() {
     parms.outSid = $("#txtTransNo").val();
     parms.comCode = mini.get("txtComName").getValue();
     parms.comName = mini.get("txtComName").getText();
-    parms.deliveryMemo = $("#txtDeliveryMemo").val();
+    parms.deliveryMemo = $("#txtdeliveryMemo").val();
 
     postAjax("set_erp_orderdelivery", parms, function (data) {
         mini.get("delivery_win").hide();

ecomServer/MainForm.cs

@@ -997,8 +997,8 @@ namespace ErpServer
                                                 {
                                                     isOnline = true;
                                                 }
-                                                //老客户单子上个设计师不支持老客户 UV设计不用管
-                                                if ("1".Equals(IsOldCustomer) && oldOrder == 0 && !uv_productIds.Contains(ProductId))
+                                                //老客户单子上个设计师不支持老客户
+                                                if ("1".Equals(IsOldCustomer) && oldOrder == 0)
                                                 {
                                                     isOnline = false;
                                                 }
@@ -1053,7 +1053,24 @@ namespace ErpServer
                                         }
                                         if ("normal".Equals(syncType))
                                         {
-                                            SqlHelper.ExecuteNonQueryStoreWithTimeOut("sp_autodispatch", sqlParameter, 10);
+                                            //UV接老客户的设计师也可以接新客
+                                            if (uv_productIds.Contains(ProductId) && shop_list.Contains(Convert.ToInt32(dr["shopid"])))
+                                            {
+                                                //UV老客只派给老客设计师
+                                                if (IsOldCustomer == "1")
+                                                {
+                                                    SqlHelper.ExecuteNonQueryStoreWithTimeOut("sp_autodispatch_day", sqlParameter, 10);
+
+                                                }
+                                                else
+                                                {
+                                                    SqlHelper.ExecuteNonQueryStoreWithTimeOut("sp_autodispatch_normal", sqlParameter, 10);
+                                                }
+                                            }
+                                            else
+                                            {
+                                                SqlHelper.ExecuteNonQueryStoreWithTimeOut("sp_autodispatch", sqlParameter, 10);
+                                            }
                                         }
                                         if ("wx".Equals(syncType))
                                         {