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("上机使用")) { //库存表对象 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 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 { 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 ) { 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';*/ 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 = ''; }
@@ -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; 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(); 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; } 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="打印"> 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> 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(); 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; } } CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx
@@ -246,6 +246,9 @@ 存放仓库 </th> <th> 备注 </th> <th> 采购时间 </th> <th width="150"> @@ -299,6 +302,9 @@ <%#Eval("PurchaseStatus")%> </td> <td> <%#Eval("WarehouseName")%> </td> <td> <%#Eval("Remark")%> </td> <td> 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(); } }
