新增拼版功能

BizCom/Dao/CeErpTradeCell.cs

@@ -139,7 +139,7 @@ namespace BizCom
 
         private int _isReturn = 0;
         /// <summary>
-        ///打回类型1供应商打回2下单打回
+        ///打回类型1供应商打回2下单打回3申请打回
         /// </summary>
         [Property]
         public int IsReturn

BizCom/Dao/CeErpTradeCellExtend.cs

@@ -472,6 +472,15 @@ namespace BizCom
             get { return _tempId; }
             set { _tempId = value; }
         }
+
+        private int _isJoint = 0;
+
+        [Property]
+        public int IsJoint
+        {
+            get { return _isJoint; }
+            set { _isJoint = value; }
+        }
         public static CeErpTradeCellExtend getByTid(string ctid)
         {
             return FindFirst(Expression.Sql(string.Format("ctid='{0}'", ctid)));

SiteCore/Handler/sync.initorder.cs

@@ -37,7 +37,6 @@ namespace SiteCore.Handler
                 lw.Add(string.Format("datediff(d,pay_time,getdate())<=91 "));
             }
 
-
             if (deliverydate1.Length > 0)
             {
                 string dw = GetDateMinuteWhere("delivery_time", deliverydate1, deliverydate2);

SiteCore/Handler/sync.order.cs

@@ -14681,6 +14681,39 @@ namespace SiteCore.Handler
             }
             returnErrorMsg("缺少必要的参数");
         }
+
+        public void saveJointorder()
+        {
+            string ctid = GetPostString("ctid");
+            if (!string.IsNullOrEmpty(ctid))
+            {
+                CeErpTradeCellExtend ceErpTradeCellExtend = CeErpTradeCellExtend.getByTid(ctid);
+                if (ceErpTradeCellExtend == null)
+                {
+                    ceErpTradeCellExtend = new CeErpTradeCellExtend();
+                    ceErpTradeCellExtend.ctid = ctid;
+                }
+                if (ceErpTradeCellExtend.IsJoint == 1)
+                {
+                    ceErpTradeCellExtend.IsJoint = 0;
+                }
+                else
+                {
+                    ceErpTradeCellExtend.IsJoint = 1;
+                }
+                if (ceErpTradeCellExtend.ID > 0)
+                {
+                    ceErpTradeCellExtend.Update();
+                }
+                else
+                {
+                    ceErpTradeCellExtend.Create();
+                }
+                returnSuccessMsg("保存成功");
+                return;
+            }
+            returnErrorMsg("缺少必要的参数");
+        }
     }
 
 }

Web/EDelivery/AllPlaceList.aspx

@@ -39,6 +39,7 @@
                 <div field="length" visible="false" align="center" headeralign="center">长</div>
                 <div field="quantity" visible="false" align="center" headeralign="center">数量</div>
                 <div field="numbers" visible="false" align="center" headeralign="center">款数</div>
+                <div field="IsJoint" visible="false" align="center" headeralign="center">是否拼版</div>
                 <div field="payment" runat="server" width="150" align="center" headeralign="center">付款金额</div>
                 <div field="payment_cyt" id="id_payment_cyt" runat="server" width="150" align="center" headeralign="center" visible="false">成本价</div>
                 <div field="seller_memo" width="150" align="center" headeralign="center" renderer="memoRenderer">备注</div>

Web/EDelivery/AllPlaceListSup.aspx

@@ -30,6 +30,7 @@
                 <div field="ProductName" visible="false" align="center" headeralign="center">产品类型</div>
                 <div field="ProductSize" visible="false" align="center" headeralign="center">产品尺寸</div>
                 <div field="ProductCount" visible="false" align="center" headeralign="center">产品数量</div>
+                <div field="IsJoint" visible="false" align="center" headeralign="center">是否拼版</div>
                 <div field="seller_memo" width="150" align="center" headeralign="center" renderer="memoRenderer">备注</div>
                 <%--<div field="OtherMemo" width="100" align="center" headeralign="center">额外备注</div>--%>
                 <div field="receiver_address" width="130" align="center" headeralign="center" renderer="addressRenderer">收货地址</div>

Web/EDelivery/js/WaitingOrder.js

@@ -354,9 +354,15 @@ function actionRenderer(e) {
     if (record.authCount > 0) {
         html += getGridBtn("view", "授权下载", "downAuth('" + record.tid + "','" + record.ctid + "')");
     }
+    html += getGridBtn("memo", record.IsJoint == 1 ? "取消拼版" : "拼版", "saveJointorder('" + record.ctid + "')");
+
     return html;
 }
-
+function saveJointorder(ctid) {
+    postAjax("saveJointorder", { ctid }, function (data) {
+        resultShow(data, "grid.reload();");
+    });
+}
 //查询按钮
 function searchFn() {
     var form = new mini.Form("#ctl00_f_all");