From 277cffdd657197fbd72444ef24a99dde7a469011 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 22 四月 2025 08:41:20 +0800
Subject: [PATCH] 设计订单 已下单改成勾 完成
---
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx.cs | 2 +
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx.cs | 1
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx | 1
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx | 16 ++++---
CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderList.aspx | 4 +-
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx.designer.cs | 9 ++++
CY_ECommercePlatform/CY.Model/OA/OA_Procurement.cs | 9 ++++
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs | 1
CY_ECommercePlatform/CY.BLL/OA/OA_OutOfStorageBLL.cs | 2
CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs | 3 +
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx | 7 +++
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx | 6 +++
13 files changed, 51 insertions(+), 12 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_OutOfStorageBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_OutOfStorageBLL.cs
index 5e5e08c..8ae4dcc 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_OutOfStorageBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_OutOfStorageBLL.cs
@@ -113,7 +113,7 @@
m_OA_Procurement = _OA_ProcurementBLL.SelectSingleModel(Keyid);
m_OA_Procurement.PurchaseStatusId = 201;
- m_OA_Procurement.Remark = m_OA_WarehouseInfo.WarehouseName;
+ m_OA_Procurement.WarehouseName = m_OA_WarehouseInfo.WarehouseName;
if (!WarehouseName.Equals("涓婃満浣跨敤"))
{
//搴撳瓨琛ㄥ璞�
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Procurement.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Procurement.cs
index 0597492..47efd42 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_Procurement.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_Procurement.cs
@@ -49,6 +49,9 @@
private string _BrandName;
private decimal? _tanPrice;
+
+ public string WarehouseName { get; set; }
+
/// <summary>
/// 绾稿紶鍚ㄤ环
/// </summary>
@@ -587,6 +590,12 @@
this.DocumentName = isChange ? MyConvert.ConvertToString(value) : DocumentName;
theValue = this.DocumentName;
}
+ else if ("WarehouseName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 27)
+ {
+ this.WarehouseName = isChange ? MyConvert.ConvertToString(value) : WarehouseName;
+ theValue = this.WarehouseName;
+ }
+
return theValue;
}
#endregion
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs
index da944f6..a9e3969 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs
@@ -123,7 +123,8 @@
new SqlParameter("@PaperWeightId",trueModel.PaperWeightId),
new SqlParameter("@tanPrice",trueModel.TanPrice??0),
new SqlParameter("@ReceiveMoney",trueModel.ReceiveMoney),
- new SqlParameter("@Commodityid",trueModel.Commodityid)
+ new SqlParameter("@Commodityid",trueModel.Commodityid),
+ new SqlParameter("@WarehouseName",string.IsNullOrEmpty(trueModel.WarehouseName)?"":trueModel.WarehouseName),
};
try
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
index b3c2236..822f6fc 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
@@ -161,24 +161,26 @@
if (sel.value.indexOf('鍏紑') >= 0) {
document.getElementById('PlateSpec').value = '395*460';
document.getElementById('PMS_ChromaticNumber').value = '1';
- /*document.getElementById('CTPCount').value = '8';*/
+ document.getElementById('CTPCount').value = '1';
- } else if (sel.value.indexOf('鍥涜壊') >= 0 ) {
+ } else if (sel.value.indexOf('鍥涜壊') >= 0) {
document.getElementById('PlateSpec').value = '770*1030';
document.getElementById('PMS_ChromaticNumber').value = '4';
- /* document.getElementById('CTPCount').value = '2';*/
+ document.getElementById('CTPCount').value = '4';
} else if (sel.value.indexOf('鍏壊') >= 0) {
document.getElementById('PlateSpec').value = '790*1030';
document.getElementById('PMS_ChromaticNumber').value = '4';
- /* document.getElementById('CTPCount').value = '2';*/
- } else if (sel.value.indexOf('榛戠櫧') >= 0 ) {
+ document.getElementById('CTPCount').value = '4';
+ } else if (sel.value.indexOf('榛戠櫧') >= 0) {
document.getElementById('PlateSpec').value = '760*920';
document.getElementById('PMS_ChromaticNumber').value = '1';
- /* document.getElementById('CTPCount').value = '2';*/
+ document.getElementById('CTPCount').value = '2';
} else if (sel.value.indexOf('杞浆') >= 0) {
document.getElementById('PlateSpec').value = '579*810';
document.getElementById('PMS_ChromaticNumber').value = '1';
- /* document.getElementById('CTPCount').value = '';*/
+ document.getElementById('CTPCount').value = '2';
+ } else {
+ document.getElementById('CTPCount').value = '';
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
index e487dc5..a586666 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
@@ -165,7 +165,7 @@
{
_inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
}
- var ssss = /*_inquiryCommonModel.PrintDemand +*/ _inquiryCommonModel.AfterWorksDemand;
+ var ssss = /*_inquiryCommonModel.PrintDemand +*/ _inquiryCommonModel.AfterWorksDemand.Replace("灏侀潰鍚庨亾锛�", "").Replace("鍐呴〉鍚庨亾锛�", "");
if(_eC_OrderBasic.PrintTypeId == -1)
{
ssss = _inquiryCommonModel.PrintDemand;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
index b48f683..b1c5a10 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
@@ -805,6 +805,7 @@
$(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("1");
}
else if ($(this).val().indexOf('鍥涜壊') >= 0) {
@@ -837,6 +838,7 @@
$("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
$(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("4");
}
else if ($(this).val().indexOf('鍏壊') >= 0) {
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍥涜壊");
@@ -869,6 +871,7 @@
$("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
$(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("4");
}
else if ($(this).val().indexOf('榛戠櫧') >= 0) {
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍗曡壊");
@@ -902,6 +905,7 @@
$(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
$("input[name='PSF_OpenWidthName'][value_ppwaerid='" + value_SelWaerId + "']").val("870");
+ $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("2");
}
else if ($(this).val().indexOf('杞浆') >= 0) {
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍗曡壊");
@@ -938,6 +942,7 @@
$("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
$(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("2");
}
// else if () {
// //$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
@@ -1042,6 +1047,7 @@
$(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").hide();
$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+ $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("");
$("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").hide();
$("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").hide();
@@ -1080,6 +1086,7 @@
$(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").hide();
$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+ $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("");
$("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").hide();
$("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").hide();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
index d0d6aba..c50de43 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
@@ -241,6 +241,7 @@
EC_SpecialForums m_EC_SpecialForums = new EC_SpecialForums();
//m_EC_SpecialForums.PSF_Note = _inquiryCommonModel.AfterWorksDemand;
m_EC_SpecialForums.PSF_Forumsid = 1;
+ m_EC_SpecialForums.PSF_CTPCount = 1;
m_EC_SpecialForumsList.Add(m_EC_SpecialForums);
this.txtPSO_Work.InnerText = _inquiryCommonModel.AfterWorksDemand;
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderList.aspx
index 96a5c4c..174166c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderList.aspx
@@ -540,8 +540,8 @@
</td>
<td menu_member_case_id="case_Xiadan" menu_member_case_name="涓嬪崟" >
- <span class="edit a_under" <%#(Eval("ShejiStatus")!=null && Eval("ShejiStatus").ToString() == "1" )?"title=''":"title='鐐瑰嚮涓嬪崟' onclick=\"toXiadan( '"+ Eval("Keyid") +"')\"" %> >
- <%#(Eval("ShejiStatus")!=null && Eval("ShejiStatus").ToString() == "1" )?"宸蹭笅鍗�":"涓嬪崟" %> </span>
+ <span class="edit <%#(Eval("ShejiStatus")!=null && Eval("ShejiStatus").ToString() == "1" )?"":"a_under" %>" <%#(Eval("ShejiStatus")!=null && Eval("ShejiStatus").ToString() == "1" )?"title=''":"title='鐐瑰嚮涓嬪崟' onclick=\"toXiadan( '"+ Eval("Keyid") +"')\"" %> >
+ <%#(Eval("ShejiStatus")!=null && Eval("ShejiStatus").ToString() == "1" )?"鈭�":"涓嬪崟" %> </span>
</td>
<td class="td_hide" menu_member_case_id="case_PrintOrder" menu_member_case_name="鎵撳嵃">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx
index 61cd5c1..d0fd7b6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx
@@ -27,6 +27,7 @@
<tr> <td class="ali03 w100px">閲囪喘鏃堕棿 锛�</td><td><span id="spanPurchaseTime" runat="server" ></span></td></tr>
<tr> <td class="ali03 ">鎿嶄綔浜猴細</td><td colspan="5" runat="server" id="spanOperator"></td></tr>
<tr> <td class="ali03 ">澶囨敞锛�</td><td colspan="5" runat="server" id="spanRemark"></td></tr>
+ <tr> <td class="ali03 ">瀛樻斁浠撳簱锛�</td><td colspan="5" runat="server" id="spanWarehouseName"></td></tr>
</table>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx.cs
index 305dcd8..1e653f5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx.cs
@@ -43,6 +43,7 @@
spanOperator.InnerText = procurenment.Operator;
spanPrice.InnerText = string.Format("{0:F}", procurenment.Price);
spanRemark.InnerText = procurenment.Remark;
+ spanWarehouseName.InnerText = procurenment.WarehouseName;
spanPurchaseStatus.InnerText = procurenment.PurchaseStatus;
spanPurchaseTime.InnerText = procurenment.PurchaseTime.ToString();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx.designer.cs
index 6d33021..64a24c3 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx.designer.cs
@@ -166,5 +166,14 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTableCell spanRemark;
+
+ /// <summary>
+ /// spanWarehouseName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlTableCell spanWarehouseName;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx
index d4d37c9..85c04d5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx
@@ -245,6 +245,9 @@
<th>
瀛樻斁浠撳簱
</th>
+ <th>
+ 澶囨敞
+ </th>
<th>
閲囪喘鏃堕棿
</th>
@@ -299,6 +302,9 @@
<%#Eval("PurchaseStatus")%>
</td>
<td>
+ <%#Eval("WarehouseName")%>
+ </td>
+ <td>
<%#Eval("Remark")%>
</td>
<td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx.cs
index fd7d7f9..6abb9c2 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx.cs
@@ -52,11 +52,13 @@
if (_OA_ProcurementBLL.DeleteModel(Procuremet))
{
JavaScript.MessageBox("鍒犻櫎鎴愬姛", this);
+ InitialData();
BindList();
}
else
{
JavaScript.MessageBox("鍒犻櫎澶辫触", this);
+ InitialData();
BindList();
}
}
--
Gitblit v1.9.1