From 259584df9c06ade70f1f351affb35d4922e1263d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 07 十一月 2025 16:23:13 +0800
Subject: [PATCH] 这个打印送货单，你们给我做两种，做一张打印没得数量的，做一张打印有数量的。送货单格式就是32开，就哎就是A4排一半。你们打了测试，注意，美观。 把那个把它做出来，下一批就用这个自动打。 不是不是打印的要数量都是有数量，要没得数量都没得数量。就是点打印的时候就两个按钮嘛，一个是有数量打印，或者或者或者空白送货单打印。 现在这个现在的送货单都是没有数量噻。现在那个要的，比如你那里再打你那个打印关闭的按钮，要把搞成两个打印嘛，就是打印空白送货单和打印送货单。 好点打印空白送货单的，就是现在这样子。点打印送货单，打印的就是那个跟有有就是有数据的送货单。作业本送货统计查询，状态查询需要修改逻辑
---
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 8
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetailshuju.aspx | 180 ++++++++++++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs | 133 ++++++++---
CY_ECommercePlatform/CY.WebForm/js/business/Order.js | 6
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx | 8
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetailshuju.aspx.designer.cs | 53 ++++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetailshuju.aspx.cs | 222 ++++++++++++++++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx | 38 +++
10 files changed, 609 insertions(+), 43 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index 8203eb5..4093fb9 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -1906,6 +1906,7 @@
<Content Include="Pages\business\DeliverWorkBookPandian.aspx" />
<Content Include="Pages\business\DeliverWorkBookFahuo.aspx" />
<Content Include="Pages\business\DeliverWorkBookfahuoqingkuang.aspx" />
+ <Content Include="Pages\business\DeliverWorkBookPrintDetailshuju.aspx" />
<Content Include="Pages\business\Waixiefukuanweikaipiaoshuoming.aspx" />
<Content Include="Pages\business\ShejiOrderDeatil.aspx" />
<Content Include="Pages\business\ShejiOrderList.aspx" />
@@ -3524,6 +3525,13 @@
<Compile Include="Pages\business\DeliverWorkBookfahuoqingkuang.aspx.designer.cs">
<DependentUpon>DeliverWorkBookfahuoqingkuang.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\business\DeliverWorkBookPrintDetailshuju.aspx.cs">
+ <DependentUpon>DeliverWorkBookPrintDetailshuju.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\DeliverWorkBookPrintDetailshuju.aspx.designer.cs">
+ <DependentUpon>DeliverWorkBookPrintDetailshuju.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\business\FileUploadHandler.ashx.cs">
<DependentUpon>FileUploadHandler.ashx</DependentUpon>
</Compile>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx
index e0e7459..804394f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx
@@ -58,7 +58,7 @@
//鍒犻櫎
function onDele(keyid) {
- top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookPrint.aspx?orderId=" + keyid, Title: "鎵撳嵃閫佽揣鍗�", Width: 600, Height: 900 });
+ top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookPrint.aspx?orderId=" + keyid, Title: "鎵撳嵃閫佽揣鍗�", Width: 800, Height: 900 });
}
//鎵归噺鍒犻櫎
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx
index 49a46d0..fdace1a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx
@@ -44,6 +44,12 @@
function onDele(keyid) {
top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookPrintDetail.aspx?PlanOrderid=" + keyid, Title: "鎵撳嵃閫佽揣鍗�", Width: 1000, Height: 900 });
}
+
+ //鍒犻櫎
+ function onDeledayin(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookPrintDetailshuju.aspx?PlanOrderid=" + keyid, Title: "鎵撳嵃閫佽揣鍗�", Width: 1000, Height: 900 });
+ }
+
//鍒犻櫎
function onDeles(orderid) {
var keyid = "";
@@ -59,6 +65,26 @@
top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookPrintDetail.aspx?orderid=" + keyid, Title: "鎵归噺鎵撳嵃閫佽揣鍗�", Width: 1000, Height: 900 });
+ }
+
+
+
+
+ //鍒犻櫎
+ function onDelesdayin(orderid) {
+ var keyid = "";
+ var num = 0;
+ $(".SelectCheck:checked").each(function (ii, vv) {
+ keyid = keyid + "," + $(vv).attr("value_kid");
+ num++;
+ });
+ if (num == 0) {
+ alertMsg("鏈�変腑浠讳綍瀛︽牎");
+ return;
+ }
+ top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookPrintDetailshuju.aspx?orderid=" + keyid, Title: "鎵归噺鎵撳嵃閫佽揣鍗�", Width: 1000, Height: 900 });
+
+
}
//鎵归噺鍒犻櫎
@@ -110,12 +136,13 @@
<td>
<input id='txtxuexiao' runat="server" maxlength='50' />
</td>
-
+ </tr>
+ <tr>
-
+
- <td colspan="8">
- <asp:Button ID="btn_Submit" Text="鏌ヨ" runat="server" OnClick="btn_Search_Click" /> <input type="button" value='鎵归噺鎵撳嵃閫佽揣鍗�' onclick="onDeles('<%=orderid %>')" />
+ <td colspan="4">
+ <asp:Button ID="btn_Submit" Text="鏌ヨ" runat="server" OnClick="btn_Search_Click" /> <input type="button" value='鎵归噺绌虹櫧閫佽揣鍗�' onclick="onDeles('<%=orderid %>')" /> <input type="button" value='鎵归噺鎵撳嵃閫佽揣鍗�' onclick="onDelesdayin('<%=orderid %>')" />
<input type="hidden" runat="server" id="hideOrderId" />
</td>
</tr>
@@ -157,7 +184,8 @@
<%#Eval("shipAddress")%>
</td>
<td class="Operate " style="text-align: center">
- <span onclick="onDele('<%#Eval("id")%>')">鎵撳嵃</span>
+ <span onclick="onDele('<%#Eval("id")%>')">绌虹櫧閫佽揣鍗�</span>
+ <span onclick="onDeledayin('<%#Eval("id")%>')">鎵撳嵃閫佽揣鍗�</span>
</td>
</tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetailshuju.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetailshuju.aspx
new file mode 100644
index 0000000..f117a3e
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetailshuju.aspx
@@ -0,0 +1,180 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DeliverWorkBookPrintDetailshuju.aspx.cs" Inherits="CY.WebForm.Pages.business.DeliverWorkBookPrintDetailshuju" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+ <title>璁㈠崟璇︽儏</title>
+ <script src="../../js/utils/jquery-1.5.1.min.js" type="text/javascript"></script>
+ <script src="../../js/common/util.js" type="text/javascript"></script>
+ <script src="../../js/common/KeyBehaviorHook.js" type="text/javascript"></script>
+ <script src="../../js/common/Printter.js?v=7" type="text/javascript"></script>
+ <script src="../../js/common/LodopFuncs.js" type="text/javascript"></script>
+ <link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
+ <!--鍓嶅彴椤甸潰start-->
+
+ <script type="text/javascript">
+
+ </script>
+</head>
+<body style='padding: 0; margin: 0;' onbeforeprint="OnPrint()" onafterprint="OnPrintOver()">
+ <form id="form1" runat="server">
+ <input type="hidden" runat="server" id="hideOrderId" />
+
+ <object id="LODOP_OB" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width="0" height="0">
+ <embed id="LODOP_EM" type="application/x-print-lodop" width="0" height="0" pluginspage="/Pages/common/install_lodop32.exe"></embed>
+ </object>
+ <div id='div_tool' printparams='0,2100,2970,"A4"'>
+ </div>
+
+ <asp:Repeater runat="server" ID='rptOrder'>
+ <ItemTemplate>
+ <div class='dbody'>
+ <style type="text/css">
+ .dbody { margin: 0; margin-left: auto; margin-right: auto; }
+ .dtitle { text-align: center; font-size: 19px; font-weight: bold; margin-top: 10px; margin-bottom: 10px; }
+ .dbody table { width: 100%; font-size: 12px; margin-top: 5px; } /* border: 1px solid #dddddd;border-top: 1px #999999 solid;*/
+ .dbody table th, .dbody table td { font-weight: normal; height: 20px; line-height: 20px; vertical-align: middle;/* border: 1px solid #999999;*/ border-top: 0; }
+ .dbody table th { background-color: #E0EDF6; font-weight: bold; }
+ .dbody table td { border-left: 0; padding-left:2px; }
+ .left {text-align: left; }
+ #div_tool { text-align: center; }
+ </style>
+ <table border="0" cellpadding="0" cellspacing="0" style="border: 0;">
+ <tr>
+ <td class='left'colspan="8">
+
+ </td>
+ </tr>
+ <tr>
+ <td class='left'colspan="8">
+
+ </td>
+ </tr>
+ <tr>
+ <td class='left'colspan="8">
+
+ </td>
+ </tr>
+ <tr>
+ <td colspan='8'>
+ <div class='dtitle'>
+ <%=orderName %></div>
+
+ </td>
+ </tr>
+ <tr>
+ <td colspan='8'>
+
+ </td>
+ </tr>
+ <tr>
+ <td class='left' colspan="4">
+ 瀛︽牎锛� <%#Eval("shipAddress")%>
+ </td>
+
+ <td class='left' colspan="4">
+ 鍦板潃锛� <%#Eval("shouhuoAddress")%>
+ </td>
+
+ </tr>
+
+ <tr>
+ <td class='left'colspan="4">
+ 鑱旂郴浜猴細 <%#Eval("shipName")%>
+ </td>
+
+ <td class='left'colspan="4">
+ 鑱旂郴鐢佃瘽锛� <%#Eval("shipMobile")%>
+ </td>
+
+
+ </tr>
+ <tr>
+ <td colspan="8">
+ <%#Eval("biaoge")%>
+ </td>
+
+ </tr>
+
+
+
+ <tr>
+ <td colspan='8'>
+
+ </td>
+ </tr>
+ <tr>
+ <td class='left'colspan="3">
+ 鏀惰揣浜猴細 鑱旂郴鐢佃瘽锛�
+ </td>
+ <td class='left' colspan="4">
+
+ </td>
+ <td class='left'colspan="1">
+ 閫佽揣浜猴細
+ </td>
+
+ </tr>
+ <tr>
+ <td class='left'colspan="3">
+ 鏀惰揣鍗曚綅锛氾紙鐩栫珷锛�
+ </td>
+ <td class='left'colspan="2">
+
+ </td>
+ <td class='left' colspan="3">
+ 閫佽揣鏃堕棿锛�
+ </td>
+ </tr>
+ <tr>
+ <td class='left'colspan="8">
+
+ </td>
+ </tr>
+ <tr>
+ <td class='left'colspan="8">
+
+ </td>
+ </tr>
+ <tr>
+ <td class='left'colspan="8">
+
+ </td>
+ </tr>
+ <tr>
+ <td class='left'colspan="8">
+
+ </td>
+ </tr>
+ <tr>
+ <td class='left'colspan="8">
+
+ </td>
+ </tr>
+ <tr>
+ <td class='left'colspan="8">
+
+ </td>
+ </tr>
+ <tr>
+ <td class='left'colspan="8">
+
+ </td>
+ </tr>
+ <tr>
+ <td class='left'colspan="8">
+
+ </td>
+ </tr>
+
+ </table>
+ <%#(Container.ItemIndex != (countss-1)&& (Container.ItemIndex+1)%2==0)?"<div class=\"page-break\"></div>":"" %>
+
+ </ItemTemplate>
+ </asp:Repeater>
+
+
+ </div>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetailshuju.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetailshuju.aspx.cs
new file mode 100644
index 0000000..4229024
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetailshuju.aspx.cs
@@ -0,0 +1,222 @@
+锘�/**
+* DeliverWorkBookPrintDetailshuju.aspx.cs
+*
+* 鍔� 鑳斤細 璁㈠崟璇︽儏
+* 绫� 鍚嶏細 DeliverWorkBookPrintDetailshuju
+*
+* Ver 鍙樻洿鏃ユ湡 璐熻矗浜� 鍙樻洿鍐呭
+* 鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�
+* V0.01 2013-4-24 13:25 鍚村磶鍧� 鍒濈増
+* V0.02 2013-5-15 18:23 鍚村磶鍧� 缂栬緫鐣岄潰鏍峰紡
+* V0.03 2013-5-15 15:58 鍚村磶鍧� 瀹屾垚鏁版嵁鑾峰彇
+* V0.04 2013-5-21 14:38 鍚村磶鍧� 澧炲姞璁㈠崟杩涘害
+* V0.05 2013-5-23 9:33 鍚村磶鍧� 淇敼缁ф壙绫讳负榛樿绫籔age浣挎樉绀轰俊鎭笉鍙楃櫥褰曟帶鍒�
+*
+*
+*
+*
+*
+*
+*/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.BLL.EC;
+using CY.Infrastructure.Common;
+using CY.Model;
+using CY.BLL;
+using CY.Model.Inquiry;
+using CY.BLL.Sys;
+
+namespace CY.WebForm.Pages.business
+{
+ /// <summary>
+ /// 璁㈠崟璇︽儏
+ /// </summary>
+ public partial class DeliverWorkBookPrintDetailshuju : BasePage
+ {
+ CoreCmsPlanOrderBLL bll_CoreCmsPlanOrderBLL = null;
+ CoreCmsPlanOrderItemBLL bll_CoreCmsPlanOrderItemBLL = null;
+ EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = null;
+ EC_OrderBasicBLL _eC_OrderBasicBLL = null;
+ public int orderkeyid = 0;
+ public string orderName = "";
+ public int countss = 0;
+
+ //鍒濆鍖�
+ public DeliverWorkBookPrintDetailshuju()
+ {
+ bll_CoreCmsPlanOrderBLL = new CoreCmsPlanOrderBLL();
+ bll_CoreCmsPlanOrderItemBLL = new CoreCmsPlanOrderItemBLL();
+ _eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
+ _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+ }
+ /// <summary>
+ /// 椤甸潰鍔犺浇浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ try
+ {
+ switch (Request["Target"])
+ {
+ case "GetCommunication":
+ break;
+ default:
+ Page_Load_Default();
+ return;
+ }
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ Response.Clear();
+ Response.Write("-1");
+ }
+ Response.End();
+ }
+
+ /// <summary>
+ /// 榛樿鍔犺浇浜嬩欢鏂规硶
+ /// </summary>
+ private void Page_Load_Default()
+ {
+ LoadOrderInfo();
+ }
+
+ /// <summary>
+ /// 鍔犺浇璁㈠崟淇℃伅
+ /// </summary>
+ private bool LoadOrderInfo()
+ {
+ //濡傛灉鏄壒閲忔墦鍗�
+ string orderIdStr = Request["orderId"];
+
+
+ //濡傛灉鏄彧鎵撳嵃涓�寮�
+ string PlanOrderidStr = Request["PlanOrderid"];
+
+
+ var coreCmsPlanOrders = new List<CoreCmsPlanOrder>();
+ if (!string.IsNullOrEmpty(orderIdStr))
+ {
+ orderIdStr = orderIdStr.Substring(1);
+ this.hideOrderId.Value = orderIdStr;
+ var ssss = bll_CoreCmsPlanOrderBLL.GetModelByids(orderIdStr);
+ coreCmsPlanOrders = ssss.ToList();
+ orderkeyid = coreCmsPlanOrders[0].orderkeyid.Value;
+ }
+ else if (!string.IsNullOrEmpty(PlanOrderidStr))
+ {
+
+ var aaaa = bll_CoreCmsPlanOrderBLL.GetModelByKeyid(PlanOrderidStr.ToInt32().Value);
+ coreCmsPlanOrders.Add(aaaa);
+
+ orderkeyid = aaaa.orderkeyid.Value;
+ }
+ else
+ {
+ CY.WebForm.BasePage.JavaScript.MessageBox("鏁版嵁涓嶅瓨鍦紒", this);
+ return false;
+ }
+
+ //璁㈠崟涓诲崟
+ var eC_OrderBasic = _eC_OrderBasicBLL.SelectModelById(orderkeyid);
+ orderName = eC_OrderBasic.DocumentName + "閫佽揣鍗�";
+ //璁㈠崟鏄庣粏
+ //EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterBLL.GetModel(orderkeyid);
+ //InquiryCommonModel _inquiryCommonModel = null;
+ //if (null == _eC_OrderPrintParameter)
+ //{
+ // _inquiryCommonModel = new InquiryCommonModel();
+ //}
+ //else
+ //{
+ // _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
+
+ //}
+ //var inquiryWorkBookModels = _inquiryCommonModel.InquiryWorkBookList.OrderBy(x => x.WorkBookSizeTxt).ThenBy(x => x.WorkBookNameTxt).ToList();
+
+
+
+ string biaotou = "";
+ string biaowei = "";
+
+
+ foreach (var coreCmsPlanOrder in coreCmsPlanOrders)
+ {
+ biaotou = "<table border=\"1\" cellpadding=\"0\" cellspacing=\"0\" style=\"border-collapse: collapse;width: 98%; \"><tr>";
+ biaowei = "";
+ var cmsPlanOrderItems = bll_CoreCmsPlanOrderItemBLL.GetModelsByOrderid(coreCmsPlanOrder.id).OrderBy(x => x.specification).ThenBy(x => x.name).ToList();
+ int i = 1;
+
+
+ foreach (var cmsPlanOrderItem in cmsPlanOrderItems)
+ {
+ biaotou += " <td style=\"text-align:center;border: 1px solid #999999;\"> " + cmsPlanOrderItem.specification + cmsPlanOrderItem.name + " </td> ";
+
+ biaowei += " <td style=\"text-align:center;border: 1px solid #999999;\"> " + cmsPlanOrderItem.nums + " </td> ";
+ if (i % 8 == 0)
+ {
+ biaotou += " </tr> <tr>"+ biaowei + " </tr>";//<td style=\"text-align:center;border: 1px solid #999999;\"></td>
+ biaowei = "";
+ }
+
+ if (i % 8 == 0 && i != cmsPlanOrderItems.Count())
+ {
+ biaotou += " <tr>";
+ }
+
+ if (i == cmsPlanOrderItems.Count() && i % 8 != 0)
+ {
+ for (int j = 0; j < 8; j++)
+ {
+ biaotou += " <td style=\"text-align:center;border: 1px solid #999999;\"></td> ";
+ biaowei += " <td style=\"text-align:center;border: 1px solid #999999;\"></td> ";
+ i = i + 1;
+ if (i % 8 == 0)
+ {
+ biaotou += " </tr> <tr>" + biaowei + " </tr>";
+ biaowei = "";
+ break;
+ }
+ }
+ }
+ i++;
+ }
+
+
+ biaotou += " <tr> <td style=\"text-align:center;border: 1px solid #999999;\"> 楠屾敹鎰忚</td > <td style=\"text-align:left;border: 1px solid #999999;\" colspan=\"7\"> 浜у搧璐ㄩ噺锛�<input type=\"checkbox\" />闈炲父婊℃剰 <input type=\"checkbox\" />婊℃剰<input type=\"checkbox\" />涓�鑸�<input type=\"checkbox\" />涓嶆弧鎰�<br/> 閰嶉�佹湇鍔★細<input type=\"checkbox\" />闈炲父婊℃剰 <input type=\"checkbox\" />婊℃剰<input type=\"checkbox\" />涓�鑸�<input type=\"checkbox\" />涓嶆弧鎰�<br/>鍏朵粬鎰忚锛�<br/></td></tr>";
+
+ biaotou += "</table>";
+
+ coreCmsPlanOrder.biaoge = biaotou;
+ }
+
+
+
+
+
+ countss = coreCmsPlanOrders.Count;
+
+ rptOrder.DataSource = coreCmsPlanOrders;
+ rptOrder.DataBind();
+
+
+
+
+
+
+ return true;
+ }
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetailshuju.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetailshuju.aspx.designer.cs
new file mode 100644
index 0000000..c97d49c
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetailshuju.aspx.designer.cs
@@ -0,0 +1,53 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class DeliverWorkBookPrintDetailshuju
+ {
+
+ /// <summary>
+ /// Head1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ /// <summary>
+ /// hideOrderId 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputHidden hideOrderId;
+
+ /// <summary>
+ /// rptOrder 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater rptOrder;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
index d3e7dc9..ff4394f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
@@ -79,11 +79,11 @@
}
var OrderState = this.selstatus.Value.Trim();
- if (!string.IsNullOrEmpty(OrderState))
- {
- var sss = OrderState.ToInt32().Value;
- coreDeliverOrderItems = coreDeliverOrderItems.Where(x => x.OrderState == sss);
- }
+ //if (!string.IsNullOrEmpty(OrderState))
+ //{
+ // var sss = OrderState.ToInt32().Value;
+ // coreDeliverOrderItems = coreDeliverOrderItems.Where(x => x.OrderState == sss);
+ //}
@@ -112,36 +112,18 @@
}
biaotou +="</tr><tr>"+ biaotou2+ "</tr>";
}
- biaowei = " <td style=\"text-align:center\"> 鍚堣 </td><td style=\"text-align:center\"> </td> <td style=\"text-align:center\"> </td> ";
- foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
- {
- var nums = cmsPlanOrderItems.Where(x => x.name == inquiryWorkBookModel.WorkBookNameTxt && x.specification == inquiryWorkBookModel.WorkBookSizeTxt).Sum(x => x.nums);
-
- var coreDeliverOrderItems1 = coreDeliverOrderItems.Where(x => x.ZYBName == inquiryWorkBookModel.WorkBookNameTxt && x.ZYBSpecification == inquiryWorkBookModel.WorkBookSizeTxt);
-
- var Number = coreDeliverOrderItems1.Sum(x => x.Number);
- var LessNumber = coreDeliverOrderItems1.Sum(x => x.LessNumber);
- if((nums - LessNumber - Number) > 0)
- {
- biaowei += " <td style=\"text-align:center\"> " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (nums - LessNumber - Number) + " </span></td>";
- }
- else
- {
- biaowei += " <td style=\"text-align:center\"> " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:green;\" >" + (nums - LessNumber - Number) + " </span></td>";
- }
-
-
-
- }
-
- foreach(var coreCmsPlanOrder in coreCmsPlanOrders)
+ List<int> PlanOrderid = new List<int>();
+
+
+ foreach (var coreCmsPlanOrder in coreCmsPlanOrders)
{
var cmsPlanOrderItems1 = cmsPlanOrderItems.Where(x => x.orderId == coreCmsPlanOrder.id);
foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
{
+ string biaoge = "";
var cmsPlanOrderItem = cmsPlanOrderItems1.Where(x => x.name == inquiryWorkBookModel.WorkBookNameTxt && x.specification == inquiryWorkBookModel.WorkBookSizeTxt).FirstOrDefault();
if (cmsPlanOrderItem != null)
{
@@ -154,16 +136,16 @@
{
if (cmsPlanOrderItem.nums - LessNumber - Number > 0)
{
- coreCmsPlanOrder.biaoge += " <td style=\"text-align:center\"> " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
+ biaoge += " <td style=\"text-align:center\"> " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
}
else
{
- coreCmsPlanOrder.biaoge += " <td style=\"text-align:center\"> " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:green;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
+ biaoge += " <td style=\"text-align:center\"> " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:green;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
}
}
else
{
- coreCmsPlanOrder.biaoge += " <td style=\"text-align:center\"> </td> <td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td> ";
+ biaoge += " <td style=\"text-align:center\"> </td> <td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td> ";
}
@@ -171,17 +153,98 @@
}
else
{
- coreCmsPlanOrder.biaoge += " <td style=\"text-align:center\"> </td> <td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td> ";
+ biaoge += " <td style=\"text-align:center\"> </td> <td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td> ";
}
-
+
+ if (string.IsNullOrEmpty(OrderState))
+ {
+ coreCmsPlanOrder.biaoge += biaoge;
+ if(PlanOrderid.Count(x=>x == coreCmsPlanOrder.id) == 0)
+ {
+ PlanOrderid.Add(coreCmsPlanOrder.id);
+ }
+ }
+ else if (OrderState == "0")
+ {
+ var jihuashuliang = cmsPlanOrderItems1.Sum(x => x.nums);
+ var coreDeliverOrderItems2 = coreDeliverOrderItems.Where(x => x.PlanOrderId == coreCmsPlanOrder.id);
+ var songhuoshuliang = coreDeliverOrderItems2.Sum(x => x.Number);
+ var jieyueshuliang = coreDeliverOrderItems2.Sum(x => x.LessNumber);
+
+ if(songhuoshuliang<=0 && jieyueshuliang <= 0)
+ {
+ coreCmsPlanOrder.biaoge += biaoge;
+ if (PlanOrderid.Count(x => x == coreCmsPlanOrder.id) == 0)
+ {
+ PlanOrderid.Add(coreCmsPlanOrder.id);
+ }
+ }
+
+ }
+ else if (OrderState == "1")
+ {
+ var jihuashuliang = cmsPlanOrderItems1.Sum(x => x.nums);
+ var coreDeliverOrderItems2 = coreDeliverOrderItems.Where(x => x.PlanOrderId == coreCmsPlanOrder.id);
+ var songhuoshuliang = coreDeliverOrderItems2.Sum(x => x.Number);
+ var jieyueshuliang = coreDeliverOrderItems2.Sum(x => x.LessNumber);
+ if (songhuoshuliang + jieyueshuliang < jihuashuliang && jihuashuliang > 0 && songhuoshuliang + jieyueshuliang > 0)
+ {
+ coreCmsPlanOrder.biaoge += biaoge;
+ if (PlanOrderid.Count(x => x == coreCmsPlanOrder.id) == 0)
+ {
+ PlanOrderid.Add(coreCmsPlanOrder.id);
+ }
+ }
+ }
+ else if (OrderState == "2")
+ {
+ var jihuashuliang = cmsPlanOrderItems1.Sum(x => x.nums);
+ var coreDeliverOrderItems2 = coreDeliverOrderItems.Where(x => x.PlanOrderId == coreCmsPlanOrder.id);
+ var songhuoshuliang = coreDeliverOrderItems2.Sum(x => x.Number);
+ var jieyueshuliang = coreDeliverOrderItems2.Sum(x => x.LessNumber);
+
+ if (songhuoshuliang + jieyueshuliang >= jihuashuliang && jihuashuliang>0)
+ {
+ coreCmsPlanOrder.biaoge += biaoge;
+ if (PlanOrderid.Count(x => x == coreCmsPlanOrder.id) == 0)
+ {
+ PlanOrderid.Add(coreCmsPlanOrder.id);
+ }
+ }
+ }
+
+
}
}
-
- this.RepClientList.DataSource = coreCmsPlanOrders;
+ biaowei = " <td style=\"text-align:center\"> 鍚堣 </td><td style=\"text-align:center\"> </td> <td style=\"text-align:center\"> </td> ";
+ foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
+ {
+ var nums = cmsPlanOrderItems.Where(x => x.name == inquiryWorkBookModel.WorkBookNameTxt && x.specification == inquiryWorkBookModel.WorkBookSizeTxt && PlanOrderid.Contains(x.orderId)).Sum(x => x.nums);
+
+ var coreDeliverOrderItems1 = coreDeliverOrderItems.Where(x => x.ZYBName == inquiryWorkBookModel.WorkBookNameTxt && x.ZYBSpecification == inquiryWorkBookModel.WorkBookSizeTxt && PlanOrderid.Contains(x.PlanOrderId));
+
+ var Number = coreDeliverOrderItems1.Sum(x => x.Number);
+ var LessNumber = coreDeliverOrderItems1.Sum(x => x.LessNumber);
+ if ((nums - LessNumber - Number) > 0)
+ {
+ biaowei += " <td style=\"text-align:center\"> " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (nums - LessNumber - Number) + " </span></td>";
+ }
+ else
+ {
+ biaowei += " <td style=\"text-align:center\"> " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:green;\" >" + (nums - LessNumber - Number) + " </span></td>";
+ }
+
+
+
+ }
+
+
+
+ this.RepClientList.DataSource = coreCmsPlanOrders.Where(x=> PlanOrderid.Contains(x.id));
this.RepClientList.DataBind();
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
index 39ec30d..2f3e5f2 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
@@ -10,7 +10,7 @@
<link href="../../Styles/changes.css" rel="stylesheet" type="text/css" />
<link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
<script src="../../js/Inquiry/Inquiry.js?v=205" type="text/javascript"></script>
- <script src="../../js/business/Order.js?v=51" type="text/javascript"></script>
+ <script src="../../js/business/Order.js?v=55" type="text/javascript"></script>
<!--鍓嶅彴椤甸潰end-->
<script type="text/javascript" language="javascript">
@@ -48,6 +48,12 @@
}
function Saveyaoqiu() {
+
+ if (document.getElementById('printCount').value == "" || parseFloat(document.getElementById('printCount').value) <= 0) {
+ alert("璁㈠崟鏁伴噺涓�0,涓嶈兘淇濆瓨!");
+ return false;
+ }
+
if (document.getElementById('txtSumPrice').value == "" || parseFloat(document.getElementById('txtSumPrice').value) <=0 ) {
if (!confirm("璁㈠崟鎬讳环涓�0锛屾槸鍚︾户缁繚瀛橈紵"))
return false;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx
index f1d8cee..1ac9bdc 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx
@@ -10,7 +10,7 @@
<link href="../../Styles/changes.css" rel="stylesheet" type="text/css" />
<link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
<script src="../../js/Inquiry/Inquiry.js?v=205" type="text/javascript"></script>
- <script src="../../js/business/Order.js?v=51" type="text/javascript"></script>
+ <script src="../../js/business/Order.js?v=55" type="text/javascript"></script>
<!--鍓嶅彴椤甸潰end-->
<script type="text/javascript" language="javascript">
diff --git a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
index 54f4803..1e7ddd1 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
@@ -1019,6 +1019,12 @@
}
}
function Save() {
+
+ if (document.getElementById('printCount').value == "" || parseFloat(document.getElementById('printCount').value) <= 0) {
+ alert("璁㈠崟鏁伴噺涓�0,涓嶈兘淇濆瓨!");
+ return false;
+ }
+
if (document.getElementById('txtSumPrice').value == "" || parseFloat(document.getElementById('txtSumPrice').value) <= 0) {
if (!confirm("璁㈠崟鎬讳环涓�0锛屾槸鍚︾户缁繚瀛橈紵"))
return false;
--
Gitblit v1.9.1