From 51aebb52e3f964ad5d0e96c6b92ae8e455b24ceb Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 10 四月 2026 13:08:17 +0800
Subject: [PATCH] 需要修改的， 不选板材，直接按照板材规格扣减库存。 发版套数不填的话就是1. 扣减库存的量就是 数量*发版套数 20260410 试卷 6年级添加 答题卡 选项 完成
---
CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js | 148 ++++++++++++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs | 70 +++++++
CY_ECommercePlatform/CY.IDAL/OA/IOA_InventoryDAL.cs | 15 +
CY_ECommercePlatform/CY.Model/OA/OA_OutOfStorage.cs | 10 +
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx | 22 +-
CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx | 58 ++++++
CY_ECommercePlatform/CY.BLL/OA/OA_InventoryBLL.cs | 19 ++
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs | 46 ++++
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs | 46 ++++
CY_ECommercePlatform/CY.SQLDAL/OA/OA_InventoryDAL.cs | 52 +++++
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx | 22 +-
CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx | 2
13 files changed, 480 insertions(+), 32 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_InventoryBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_InventoryBLL.cs
index 1a9df5d..e51a4ae 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_InventoryBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_InventoryBLL.cs
@@ -102,6 +102,25 @@
return inventoryDAL.SelecetModelDetailInfoList(pa, FirmId, WarehouseName, GoodsName, CommodityName, BrandName, SpecificationName);
}
+
+ /// <summary>
+ /// 鑾峰彇搴撳瓨璐у搧鐨勮缁嗕俊鎭�
+ /// </summary>
+ /// <param name="pa"></param>
+ /// <param name="FirmId"></param>
+ /// <param name="CargoSpaceName"></param>
+ /// <param name="WarehouseName"></param>
+ /// <param name="GoodsName"></param>
+ /// <param name="CommodityName"></param>
+ /// <param name="BrandName"></param>
+ /// <param name="SpecificationName"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_Inventory> SelecetModelDetailInfoList(Guid FirmId, string WarehouseName, string GoodsName, string CommodityName, string BrandName, string SpecificationName)
+ {
+
+ return inventoryDAL.SelecetModelDetailInfoList( FirmId, WarehouseName, GoodsName, CommodityName, BrandName, SpecificationName);
+ }
+
/// <summary>
/// 鑾峰彇鍗曚釜搴撳瓨淇℃伅
/// </summary>
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IOA_InventoryDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IOA_InventoryDAL.cs
index cd3586c..022f186 100644
--- a/CY_ECommercePlatform/CY.IDAL/OA/IOA_InventoryDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/OA/IOA_InventoryDAL.cs
@@ -43,6 +43,21 @@
/// <returns></returns>
IEnumerable<Model.OA_Inventory> SelecetModelDetailInfoList(Pagination pa, Guid FirmId, string WarehouseName,string GoodsName, string CommodityName, string BrandName, string SpecificationName);
+
+ /// <summary>
+ /// 鑾峰彇搴撳瓨璐у搧鐨勮缁嗕俊鎭�
+ /// </summary>
+ /// <param name="pa"></param>
+ /// <param name="FirmId"></param>
+ /// <param name="CargoSpaceName"></param>
+ /// <param name="WarehouseName"></param>
+ /// <param name="GoodsName"></param>
+ /// <param name="CommodityName"></param>
+ /// <param name="BrandName"></param>
+ /// <param name="SpecificationName"></param>
+ /// <returns></returns>
+ IEnumerable<Model.OA_Inventory> SelecetModelDetailInfoList( Guid FirmId, string WarehouseName, string GoodsName, string CommodityName, string BrandName, string SpecificationName);
+
/// <summary>
/// 鑾峰彇鍗曚釜搴撳瓨淇℃伅
/// </summary>
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_OutOfStorage.cs b/CY_ECommercePlatform/CY.Model/OA/OA_OutOfStorage.cs
index 00434f1..724ca6b 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_OutOfStorage.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_OutOfStorage.cs
@@ -393,6 +393,16 @@
}
+ /// <summary>
+ /// 璐т綅鍚嶅瓧
+ /// </summary>
+ public int? InventoryId
+ {
+ set;
+ get;
+ }
+
+
#endregion Model
#region Visiter
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_InventoryDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_InventoryDAL.cs
index 518f751..667d6bf 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_InventoryDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_InventoryDAL.cs
@@ -384,6 +384,58 @@
return _dataBase.SelectModelPage<Model.OA_Inventory>(pa, selectTarget, fromSource, " a.LastUpdateTime ");
}
+
+
+ /// <summary>
+ /// 鑾峰彇璐у搧鐨勮缁嗕俊鎭�
+ /// </summary>
+ /// <param name="pa"></param>
+ /// <param name="FirmId"></param>
+ /// <param name="CargoSpaceName"></param>
+ /// <param name="WarehouseName"></param>
+ /// <param name="GoodsName"></param>
+ /// <param name="CommodityName"></param>
+ /// <param name="BrandName"></param>
+ /// <param name="SpecificationName"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_Inventory> SelecetModelDetailInfoList( Guid FirmId, string WarehouseName, string GoodsName, string CommodityName, string BrandName, string SpecificationName)
+ {
+
+ string selectTarget = " a.*,b.Name AS CargoSpaceName , c.WarehouseName AS WarehouseName ,e.Name AS BrandName,f.Name AS SpecificationName,g.GoodsName ,g.CommodityName ,g.IsPaper ,g.CommodityId";
+
+ string condition = " where a.FirmId='" + FirmId + "' ";
+ if (!string.IsNullOrEmpty(WarehouseName))
+ {
+ condition += string.Format(" and a.WarehouseName='{0}' ", WarehouseName);
+ }
+
+ if (!string.IsNullOrEmpty(BrandName))
+ {
+ condition += string.Format(" and e.Name='{0}' ", BrandName);
+ }
+ if (!string.IsNullOrEmpty(SpecificationName))
+ {
+ condition += string.Format(" and f.Name='{0}' ", SpecificationName);
+ }
+ if (!string.IsNullOrEmpty(GoodsName))
+ {
+ condition += string.Format(" and g.GoodsName='{0}' ", GoodsName);
+ }
+
+ if (!string.IsNullOrEmpty(CommodityName))
+ {
+ condition += string.Format(" and g.CommodityName='{0}' ", CommodityName);
+ }
+
+ string fromSource = "dbo.OA_Inventory AS a LEFT JOIN dbo.OA_CargoSpace AS b ON a.CargoSpaceId=b.Keyid " +
+ " LEFT JOIN dbo.OA_WarehouseInfo AS c ON a.WarehouseId = c.Keyid"
+ + " LEFT JOIN dbo.OA_Specification AS f ON a.SpecificationId=f.Keyid "
+ + " LEFT JOIN dbo.OA_Brand AS e ON a.BrandId = e.Keyid "
+ + " LEFT JOIN (SELECT d.* ,j.CommodityName,j.IsPaper,j.Keyid AS CommodityId FROM dbo.OA_GoodsInfo AS d "
+ + "LEFT JOIN dbo.OA_Commodity AS j ON d.GoodsTypeId=j.Keyid ) AS g ON a.GoodsId=g.Keyid " + condition;
+ return _dataBase.SelectModel<Model.OA_Inventory>( selectTarget, fromSource);
+ }
+
public IEnumerable<OA_FirmAccount> getAllSubject(Guid FirmId, string AccountType)
{
string selectTarget = " Keyid,AccountName,AccountType,UserName,Balance";
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
index 63cf9c9..0d72fce 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
@@ -286,7 +286,7 @@
</div>
</td>
<td>
- <input type="text" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="txt CTPCount lbCTPCount" name="CTPCount" value="<%#Eval("PSF_CTPCount")%>" style=" width: 80px" />
+ <input type="text" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="txt CTPCount lbCTPCount int" name="CTPCount" value="<%#Eval("PSF_CTPCount")%>" style=" width: 80px" />
</td>
<td>
@@ -414,7 +414,7 @@
<td colspan="7">
</td>
</tr>
- <tr >
+ <tr style="display:none;" >
<td >
<select keepdefaultstyle="true" value_selwaerid="<%#Container.ItemIndex + 1%>" name="selPlateType" id="selPlateType">
<option value="鏈巶CTP">鏈巶CTP</option>
@@ -695,7 +695,7 @@
$("select[name='PSF_OpenSpecifications']").last().val("8寮�");
$("select[name='PSF_OpenSpecifications']").last().change();
- $("input[name='CTPSpecName']").last().val("395*460");
+ $("input[name='CTPSpecName']").last().val("460*395");
$("input[name='PSF_PNum']").last().val("");
if ($("select[name='PSF_Component']").first().val() == "灏侀潰") {
@@ -1035,7 +1035,7 @@
if ($(this).val().indexOf('鍏紑') >= 0) {
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍗曡壊");
$("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("鍗曡壊");
- $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("395*460");
+ $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("460*395");
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("8寮�");
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
@@ -1077,7 +1077,7 @@
else if ($(this).val().indexOf('鍥涜壊') >= 0) {
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍥涜壊");
$("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("鍥涜壊");
- $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("770*1030");
+ $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("1030*770");
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("2寮�");
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
@@ -1115,7 +1115,7 @@
else if ($(this).val().indexOf('鍏壊') >= 0) {
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍥涜壊");
$("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("鍥涜壊");
- $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("790*1030");
+ $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("1030*790");
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("2寮�");
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
@@ -1154,7 +1154,7 @@
else if ($(this).val().indexOf('榛戠櫧') >= 0) {
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍗曡壊");
$("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("鍗曡壊");
- $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("760*920");
+ $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("920*760");
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("2寮�");
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
@@ -1193,7 +1193,7 @@
else if ($(this).val().indexOf('杞浆') >= 0) {
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍗曡壊");
$("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("鍗曡壊");
- $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("578*810");
+ $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("810*579");
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("");
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").hide();
@@ -1268,7 +1268,7 @@
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍗曡壊");
$("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("鍗曡壊");
- $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("395*460");
+ $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("460*395");
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("");
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
@@ -1308,7 +1308,7 @@
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍗曡壊");
$("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("鍗曡壊");
- $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("395*460");
+ $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("460*395");
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("");
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
@@ -1929,7 +1929,7 @@
if (keyid != "") {
} else {
- $(vv).val("395*460");
+ $(vv).val("460*395");
}
});
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
index b0d1827..00ff908 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
@@ -1002,7 +1002,7 @@
m_OA_OutOfStorageOld.GoodsId = m_OA_InventoryOld.GoodsId;
m_OA_OutOfStorageOld.CargoSpaceId = 0;
m_OA_OutOfStorageOld.WarehouseId = m_OA_InventoryOld.WarehouseId;
- m_OA_OutOfStorageOld.InfoType = "纭鍑哄簱";
+ m_OA_OutOfStorageOld.InfoType = "鍑哄簱";
m_OA_OutOfStorageOld.SuppliersId = 0;
m_OA_OutOfStorageOld.Price = 0;
m_OA_OutOfStorageOld.Quantity = PMS_PaperCount1_NEW[Array.IndexOf(PSF_PaperId_NEW, item)].ToInt32() ?? 0;
@@ -1014,7 +1014,10 @@
m_OA_OutOfStorageOld.BrandId = m_OA_InventoryOld.BrandId;
m_OA_OutOfStorageOld.PaperWeightId = m_OA_InventoryOld.PaperWeightId;
m_OA_OutOfStorageOld.SpecificationId = m_OA_InventoryOld.SpecificationId;
+ m_OA_OutOfStorageOld.InventoryId = m_OA_InventoryOld.Keyid;
m_OA_OutOfStorageList.Add(m_OA_OutOfStorageOld);
+ m_OA_InventoryOld.InventoryCount = m_OA_InventoryOld.InventoryCount - m_OA_OutOfStorageOld.Quantity;
+ m_OA_InventoryList.Add(m_OA_InventoryOld);
}
}
}
@@ -1028,7 +1031,7 @@
m_OA_OutOfStorage.GoodsId = m_OA_Inventory.GoodsId;
m_OA_OutOfStorage.CargoSpaceId = 0;
m_OA_OutOfStorage.WarehouseId = m_OA_Inventory.WarehouseId;
- m_OA_OutOfStorage.InfoType = "纭鍑哄簱";
+ m_OA_OutOfStorage.InfoType = "鍑哄簱";
m_OA_OutOfStorage.SuppliersId = 0;
m_OA_OutOfStorage.Price = 0;
if (j == 0)
@@ -1051,10 +1054,49 @@
m_OA_OutOfStorage.BrandId = m_OA_Inventory.BrandId;
m_OA_OutOfStorage.PaperWeightId = m_OA_Inventory.PaperWeightId;
m_OA_OutOfStorage.SpecificationId = m_OA_Inventory.SpecificationId;
+ m_OA_OutOfStorage.InventoryId = m_OA_Inventory.Keyid;
m_OA_OutOfStorageList.Add(m_OA_OutOfStorage);
+ m_OA_Inventory.InventoryCount = m_OA_Inventory.InventoryCount - m_OA_OutOfStorage.Quantity;
+ m_OA_InventoryList.Add(m_OA_Inventory);
}
}
}
+
+ var CTPSpecNamei = CTPSpecName[i];
+ var CTPCounti = CTPCount[i];
+ var PSF_Fabantaoshui = PSF_Fabantaoshu[i];
+ if (!string.IsNullOrEmpty(CTPCounti))
+ {
+ OA_Inventory m_OA_InventoryOld = bll_OA_InventoryBLL.SelecetModelDetailInfoList(CurrentUser.MemberId, "", "", "鏉挎潗", "", CTPSpecNamei).FirstOrDefault();
+ if (m_OA_InventoryOld != null)
+ {
+ OA_OutOfStorage m_OA_OutOfStorageOld = new OA_OutOfStorage();
+ m_OA_OutOfStorageOld.FirmId = CurrentUser.MemberId;
+ m_OA_OutOfStorageOld.GoodsId = m_OA_InventoryOld.GoodsId;
+ m_OA_OutOfStorageOld.CargoSpaceId = 0;
+ m_OA_OutOfStorageOld.WarehouseId = m_OA_InventoryOld.WarehouseId;
+ m_OA_OutOfStorageOld.InfoType = "鍑哄簱";
+ m_OA_OutOfStorageOld.SuppliersId = 0;
+ m_OA_OutOfStorageOld.Price = 0;
+ m_OA_OutOfStorageOld.Quantity = CTPCounti.ToInt32() ?? 0;
+ if (!string.IsNullOrEmpty(PSF_Fabantaoshui))
+ {
+ m_OA_OutOfStorageOld.Quantity = m_OA_OutOfStorageOld.Quantity * (PSF_Fabantaoshui.ToInt32() ?? 0);
+ }
+ m_OA_OutOfStorageOld.AllMoney = 0;
+ m_OA_OutOfStorageOld.LastUpdateTime = DateTime.Now;
+ m_OA_OutOfStorageOld.Operator = CurrentUser.ShortName;
+ m_OA_OutOfStorageOld.Remark = "";
+ m_OA_OutOfStorageOld.TanPrice = 0;
+ m_OA_OutOfStorageOld.BrandId = m_OA_InventoryOld.BrandId;
+ m_OA_OutOfStorageOld.PaperWeightId = m_OA_InventoryOld.PaperWeightId;
+ m_OA_OutOfStorageOld.SpecificationId = m_OA_InventoryOld.SpecificationId;
+ m_OA_OutOfStorageOld.InventoryId = m_OA_InventoryOld.Keyid;
+ m_OA_OutOfStorageList.Add(m_OA_OutOfStorageOld);
+ m_OA_InventoryOld.InventoryCount = m_OA_InventoryOld.InventoryCount - m_OA_OutOfStorageOld.Quantity;
+ m_OA_InventoryList.Add(m_OA_InventoryOld);
+ }
+ }
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
index 0940640..2b66f8d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
@@ -298,7 +298,7 @@
</div>
</td>
<td>
- <input type="text" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="txt CTPCount lbCTPCount" name="CTPCount" value="<%#Eval("PSF_CTPCount")%>" style=" width: 80px" />
+ <input type="text" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="txt CTPCount lbCTPCount int" name="CTPCount" value="<%#Eval("PSF_CTPCount")%>" style=" width: 80px" />
</td>
<td>
@@ -426,7 +426,7 @@
<td colspan="7">
</td>
</tr>
- <tr >
+ <tr style="display:none;" >
<td >
<select keepdefaultstyle="true" value_selwaerid="<%#Container.ItemIndex + 1%>" name="selPlateType" id="selPlateType">
<option value="鏈巶CTP">鏈巶CTP</option>
@@ -749,7 +749,7 @@
$("select[name='PSF_OpenSpecifications']").last().val("8寮�");
$("select[name='PSF_OpenSpecifications']").last().change();
- $("input[name='CTPSpecName']").last().val("395*460");
+ $("input[name='CTPSpecName']").last().val("460*395");
$("input[name='PSF_PNum']").last().val("");
if ($("select[name='PSF_Component']").first().val() == "灏侀潰") {
@@ -1108,7 +1108,7 @@
if ($(this).val().indexOf('鍏紑') >= 0) {
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍗曡壊");
$("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("鍗曡壊");
- $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("395*460");
+ $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("460*395");
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("8寮�");
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
@@ -1150,7 +1150,7 @@
else if ($(this).val().indexOf('鍥涜壊') >= 0) {
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍥涜壊");
$("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("鍥涜壊");
- $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("770*1030");
+ $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("1030*770");
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("2寮�");
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
@@ -1188,7 +1188,7 @@
else if ($(this).val().indexOf('鍏壊') >= 0) {
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍥涜壊");
$("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("鍥涜壊");
- $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("790*1030");
+ $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("1030*790");
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("2寮�");
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
@@ -1227,7 +1227,7 @@
else if ($(this).val().indexOf('榛戠櫧') >= 0) {
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍗曡壊");
$("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("鍗曡壊");
- $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("760*920");
+ $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("920*760");
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("2寮�");
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
@@ -1266,7 +1266,7 @@
else if ($(this).val().indexOf('杞浆') >= 0) {
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍗曡壊");
$("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("鍗曡壊");
- $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("578*810");
+ $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("810*579");
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("");
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").hide();
@@ -1341,7 +1341,7 @@
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍗曡壊");
$("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("鍗曡壊");
- $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("395*460");
+ $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("460*395");
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("");
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
@@ -1440,7 +1440,7 @@
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍗曡壊");
$("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("鍗曡壊");
- $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("395*460");
+ $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("460*395");
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("");
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
@@ -2077,7 +2077,7 @@
} else {
if ("<%=PrintTypeId %>" != "7") {
- $(vv).val("395*460");
+ $(vv).val("460*395");
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
index 7e8352a..57a91a1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
@@ -790,7 +790,7 @@
m_OA_OutOfStorageOld.GoodsId = m_OA_InventoryOld.GoodsId;
m_OA_OutOfStorageOld.CargoSpaceId = 0;
m_OA_OutOfStorageOld.WarehouseId = m_OA_InventoryOld.WarehouseId;
- m_OA_OutOfStorageOld.InfoType = "纭鍑哄簱";
+ m_OA_OutOfStorageOld.InfoType = "鍑哄簱";
m_OA_OutOfStorageOld.SuppliersId = 0;
m_OA_OutOfStorageOld.Price = 0;
m_OA_OutOfStorageOld.Quantity = PMS_PaperCount1_NEW[Array.IndexOf(PSF_PaperId_NEW, item)].ToInt32() ?? 0;
@@ -802,7 +802,10 @@
m_OA_OutOfStorageOld.BrandId = m_OA_InventoryOld.BrandId;
m_OA_OutOfStorageOld.PaperWeightId = m_OA_InventoryOld.PaperWeightId;
m_OA_OutOfStorageOld.SpecificationId = m_OA_InventoryOld.SpecificationId;
+ m_OA_OutOfStorageOld.InventoryId = m_OA_InventoryOld.Keyid;
m_OA_OutOfStorageList.Add(m_OA_OutOfStorageOld);
+ m_OA_InventoryOld.InventoryCount = m_OA_InventoryOld.InventoryCount - m_OA_OutOfStorageOld.Quantity;
+ m_OA_InventoryList.Add(m_OA_InventoryOld);
}
}
}
@@ -816,7 +819,7 @@
m_OA_OutOfStorage.GoodsId = m_OA_Inventory.GoodsId;
m_OA_OutOfStorage.CargoSpaceId = 0;
m_OA_OutOfStorage.WarehouseId = m_OA_Inventory.WarehouseId;
- m_OA_OutOfStorage.InfoType = "纭鍑哄簱";
+ m_OA_OutOfStorage.InfoType = "鍑哄簱";
m_OA_OutOfStorage.SuppliersId = 0;
m_OA_OutOfStorage.Price = 0;
if (j == 0)
@@ -839,10 +842,49 @@
m_OA_OutOfStorage.BrandId = m_OA_Inventory.BrandId;
m_OA_OutOfStorage.PaperWeightId = m_OA_Inventory.PaperWeightId;
m_OA_OutOfStorage.SpecificationId = m_OA_Inventory.SpecificationId;
+ m_OA_OutOfStorage.InventoryId = m_OA_Inventory.Keyid;
m_OA_OutOfStorageList.Add(m_OA_OutOfStorage);
+ m_OA_Inventory.InventoryCount = m_OA_Inventory.InventoryCount - m_OA_OutOfStorage.Quantity;
+ m_OA_InventoryList.Add(m_OA_Inventory);
}
}
}
+
+ var CTPSpecNamei = CTPSpecName[i];
+ var CTPCounti = CTPCount[i];
+ var PSF_Fabantaoshui = PSF_Fabantaoshu[i];
+ if (!string.IsNullOrEmpty(CTPCounti))
+ {
+ OA_Inventory m_OA_InventoryOld = bll_OA_InventoryBLL.SelecetModelDetailInfoList(CurrentUser.MemberId, "", "", "鏉挎潗", "", CTPSpecNamei).FirstOrDefault();
+ if (m_OA_InventoryOld != null)
+ {
+ OA_OutOfStorage m_OA_OutOfStorageOld = new OA_OutOfStorage();
+ m_OA_OutOfStorageOld.FirmId = CurrentUser.MemberId;
+ m_OA_OutOfStorageOld.GoodsId = m_OA_InventoryOld.GoodsId;
+ m_OA_OutOfStorageOld.CargoSpaceId = 0;
+ m_OA_OutOfStorageOld.WarehouseId = m_OA_InventoryOld.WarehouseId;
+ m_OA_OutOfStorageOld.InfoType = "鍑哄簱";
+ m_OA_OutOfStorageOld.SuppliersId = 0;
+ m_OA_OutOfStorageOld.Price = 0;
+ m_OA_OutOfStorageOld.Quantity = CTPCounti.ToInt32() ?? 0;
+ if (!string.IsNullOrEmpty(PSF_Fabantaoshui))
+ {
+ m_OA_OutOfStorageOld.Quantity = m_OA_OutOfStorageOld.Quantity * (PSF_Fabantaoshui.ToInt32() ?? 0);
+ }
+ m_OA_OutOfStorageOld.AllMoney = 0;
+ m_OA_OutOfStorageOld.LastUpdateTime = DateTime.Now;
+ m_OA_OutOfStorageOld.Operator = CurrentUser.ShortName;
+ m_OA_OutOfStorageOld.Remark = "";
+ m_OA_OutOfStorageOld.TanPrice = 0;
+ m_OA_OutOfStorageOld.BrandId = m_OA_InventoryOld.BrandId;
+ m_OA_OutOfStorageOld.PaperWeightId = m_OA_InventoryOld.PaperWeightId;
+ m_OA_OutOfStorageOld.SpecificationId = m_OA_InventoryOld.SpecificationId;
+ m_OA_OutOfStorageOld.InventoryId = m_OA_InventoryOld.Keyid;
+ m_OA_OutOfStorageList.Add(m_OA_OutOfStorageOld);
+ m_OA_InventoryOld.InventoryCount = m_OA_InventoryOld.InventoryCount - m_OA_OutOfStorageOld.Quantity;
+ m_OA_InventoryList.Add(m_OA_InventoryOld);
+ }
+ }
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
index 2b5b440..1d15c37 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
@@ -9,7 +9,7 @@
<link rel="stylesheet" type="text/css" href="../../Styles/base.css" />
<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=210" type="text/javascript"></script>
+ <script src="../../js/Inquiry/Inquiry.js?v=211" type="text/javascript"></script>
<script src="../../js/business/Order.js?v=56" type="text/javascript"></script>
<!--鍓嶅彴椤甸潰end-->
<script type="text/javascript" language="javascript">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx
index f53b123..e61e0ea 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx
@@ -9,7 +9,7 @@
<link rel="stylesheet" type="text/css" href="../../Styles/base.css" />
<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=210" type="text/javascript"></script>
+ <script src="../../js/Inquiry/Inquiry.js?v=211" type="text/javascript"></script>
<script src="../../js/business/Order.js?v=56" type="text/javascript"></script>
<!--鍓嶅彴椤甸潰end-->
<script type="text/javascript" language="javascript">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
index 45ca58a..c4d90a3 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
@@ -1262,7 +1262,7 @@
}
}
- else if (inquirySHiJuanModel.Nianji == "涓夊勾绾�" || inquirySHiJuanModel.Nianji == "鍥涘勾绾�" || inquirySHiJuanModel.Nianji == "浜斿勾绾�" || inquirySHiJuanModel.Nianji == "鍏勾绾�")
+ else if (inquirySHiJuanModel.Nianji == "涓夊勾绾�" || inquirySHiJuanModel.Nianji == "鍥涘勾绾�" || inquirySHiJuanModel.Nianji == "浜斿勾绾�" )
{
if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyucheckboxinput))
{
@@ -1289,6 +1289,74 @@
}
+
+ else if ( inquirySHiJuanModel.Nianji == "鍏勾绾�")
+ {
+ if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyucheckboxinput))
+ {
+ //printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyucheckboxinput + "寮狅紝";
+ //printDemand += inquirySHiJuanModel.yingyuselect + "锛�";
+
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鑻辫锛�" + inquirySHiJuanModel.yingyucheckboxinput + "寮狅紝" + inquirySHiJuanModel.yingyuselect + "</td>";
+ }
+ if (!string.IsNullOrEmpty(inquirySHiJuanModel.kexuecheckboxinput))
+ {
+ //printDemand += "绉戝锛�" + inquirySHiJuanModel.kexuecheckboxinput + "寮狅紝";
+ //printDemand += inquirySHiJuanModel.kexueselect + "锛�";
+
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">绉戝锛�" + inquirySHiJuanModel.kexuecheckboxinput + "寮狅紝" + inquirySHiJuanModel.kexueselect + "</td>";
+ }
+ if (!string.IsNullOrEmpty(inquirySHiJuanModel.pingdecheckboxinput))
+ {
+ //printDemand += "鍝佸痉涓庣敓娲伙細" + inquirySHiJuanModel.pingdecheckboxinput + "寮狅紝";
+ //printDemand += inquirySHiJuanModel.pingdeselect + "锛�";
+
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍝佸痉涓庣敓娲伙細" + inquirySHiJuanModel.pingdecheckboxinput + "寮狅紝" + inquirySHiJuanModel.pingdeselect + "</td>";
+ }
+ printDemand += "</tr>";
+ printDemand += "<tr>";
+ // printDemand += "绛旈鍗★細";
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">绛旈鍗★細</td>";
+ if (!string.IsNullOrEmpty(inquirySHiJuanModel.yuwendatikacheckboxinput))
+ {
+ //printDemand += "璇枃锛�" + inquirySHiJuanModel.yuwendatikacheckboxinput + "寮狅紝";
+ //printDemand += inquirySHiJuanModel.yuwendatikaselect + "锛�";
+
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">璇枃锛�" + inquirySHiJuanModel.yuwendatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.yuwendatikaselect + "</td>";
+ }
+ if (!string.IsNullOrEmpty(inquirySHiJuanModel.shuxuedatikacheckboxinput))
+ {
+ //printDemand += "鏁板锛�" + inquirySHiJuanModel.shuxuedatikacheckboxinput + "寮狅紝";
+ //printDemand += inquirySHiJuanModel.shuxuedatikaselect + "锛�";
+
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鏁板锛�" + inquirySHiJuanModel.shuxuedatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.shuxuedatikaselect + "</td>";
+ }
+ if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyudatikacheckboxinput))
+ {
+ //printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyudatikacheckboxinput + "寮狅紝";
+ //printDemand += inquirySHiJuanModel.yingyudatikaselect + "锛�";
+
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鑻辫锛�" + inquirySHiJuanModel.yingyudatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.yingyudatikaselect + "</td>";
+ }
+ if (!string.IsNullOrEmpty(inquirySHiJuanModel.kexuedatikacheckboxinput))
+ {
+ //printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.kexuedatikacheckboxinput + "寮狅紝";
+ //printDemand += inquirySHiJuanModel.kexuedatikaselect + "锛�";
+
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">绉戝锛�" + inquirySHiJuanModel.kexuedatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.kexuedatikaselect + "</td>";
+ }
+ if (!string.IsNullOrEmpty(inquirySHiJuanModel.pingdedatikacheckboxinput))
+ {
+ //printDemand += "鍦扮悊锛�" + inquirySHiJuanModel.pingdedatikacheckboxinput + "寮狅紝";
+ //printDemand += inquirySHiJuanModel.pingdedatikaselect + "锛�";
+
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍝佸痉涓庣敓娲伙細" + inquirySHiJuanModel.pingdedatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.pingdedatikaselect + "</td>";
+ }
+
+
+
+
+ }
else if (inquirySHiJuanModel.Nianji == "涓冨勾绾�")
{
if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyucheckboxinput))
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx
index 89dbd93..56db46e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx
@@ -739,7 +739,7 @@
$("input[name='zhengzhicheckboxinput'][value_id='" + value_id + "']").hide();
$("select[name='zhengzhiselect'][value_id='" + value_id + "']").hide();
$("span[name='zhengzhititle'][value_id='" + value_id + "']").hide();
$("span[name='zhengzhiunit'][value_id='" + value_id + "']").hide();
$("input[name='sixiangpingdecheckboxinput'][value_id='" + value_id + "']").hide();
$("select[name='sixiangpingdeselect'][value_id='" + value_id + "']").hide();
$("span[name='sixiangpingdetitle'][value_id='" + value_id + "']").hide();
$("span[name='sixiangpingdeunit'][value_id='" + value_id + "']").hide();
- } else if ($(obj).val() == "涓夊勾绾�" || $(obj).val() == "鍥涘勾绾�" || $(obj).val() == "浜斿勾绾�" || $(obj).val() == "鍏勾绾�") {
+ } else if ($(obj).val() == "涓夊勾绾�" || $(obj).val() == "鍥涘勾绾�" || $(obj).val() == "浜斿勾绾�" ) {
$("tr[name='datika'][value_id='" + value_id + "']").hide();
$("tr[name='shijuan'][value_id='" + value_id + "']").show();
@@ -763,7 +763,61 @@
$("input[name='sixiangpingdecheckboxinput'][value_id='" + value_id + "']").hide();
$("select[name='sixiangpingdeselect'][value_id='" + value_id + "']").hide();
$("span[name='sixiangpingdetitle'][value_id='" + value_id + "']").hide();
$("span[name='sixiangpingdeunit'][value_id='" + value_id + "']").hide();
- } else if ($(obj).val() == "涓冨勾绾�" ) {
+ }
+ else if ( $(obj).val() == "鍏勾绾�") {
+ $("tr[name='datika'][value_id='" + value_id + "']").show();
+ $("tr[name='shijuan'][value_id='" + value_id + "']").show();
+
+ $("input[name='yingyucheckboxinput'][value_id='" + value_id + "']").show();
$("select[name='yingyuselect'][value_id='" + value_id + "']").show();
$("span[name='yingyutitle'][value_id='" + value_id + "']").show();
$("span[name='yingyuunit'][value_id='" + value_id + "']").show();
+
+ $("input[name='kexuecheckboxinput'][value_id='" + value_id + "']").show();
$("select[name='kexueselect'][value_id='" + value_id + "']").show();
$("span[name='kexuetitle'][value_id='" + value_id + "']").show();
$("span[name='kexueunit'][value_id='" + value_id + "']").show();
+
+ $("input[name='pingdecheckboxinput'][value_id='" + value_id + "']").show();
$("select[name='pingdeselect'][value_id='" + value_id + "']").show();
$("span[name='pingdetitle'][value_id='" + value_id + "']").show();
$("span[name='pingdeunit'][value_id='" + value_id + "']").show();
+
+ $("input[name='lishicheckboxinput'][value_id='" + value_id + "']").hide();
$("select[name='lishiselect'][value_id='" + value_id + "']").hide();
$("span[name='lishititle'][value_id='" + value_id + "']").hide();
$("span[name='lishiunit'][value_id='" + value_id + "']").hide();
+
+ $("input[name='dilicheckboxinput'][value_id='" + value_id + "']").hide();
$("select[name='diliselect'][value_id='" + value_id + "']").hide();
$("span[name='dilititle'][value_id='" + value_id + "']").hide();
$("span[name='diliunit'][value_id='" + value_id + "']").hide();
+
+ $("input[name='shengwucheckboxinput'][value_id='" + value_id + "']").hide();
$("select[name='shengwuselect'][value_id='" + value_id + "']").hide();
$("span[name='shengwutitle'][value_id='" + value_id + "']").hide();
$("span[name='shengwuunit'][value_id='" + value_id + "']").hide();
+
+ $("input[name='wulicheckboxinput'][value_id='" + value_id + "']").hide();
$("select[name='wuliselect'][value_id='" + value_id + "']").hide();
$("span[name='wulititle'][value_id='" + value_id + "']").hide();
$("span[name='wuliunit'][value_id='" + value_id + "']").hide();
+
+ $("input[name='huaxuecheckboxinput'][value_id='" + value_id + "']").hide();
$("select[name='huaxueselect'][value_id='" + value_id + "']").hide();
$("span[name='huaxuetitle'][value_id='" + value_id + "']").hide();
$("span[name='huaxueunit'][value_id='" + value_id + "']").hide();
+
+ $("input[name='zhengzhicheckboxinput'][value_id='" + value_id + "']").hide();
$("select[name='zhengzhiselect'][value_id='" + value_id + "']").hide();
$("span[name='zhengzhititle'][value_id='" + value_id + "']").hide();
$("span[name='zhengzhiunit'][value_id='" + value_id + "']").hide();
+
+ $("input[name='sixiangpingdecheckboxinput'][value_id='" + value_id + "']").hide();
$("select[name='sixiangpingdeselect'][value_id='" + value_id + "']").hide();
$("span[name='sixiangpingdetitle'][value_id='" + value_id + "']").hide();
$("span[name='sixiangpingdeunit'][value_id='" + value_id + "']").hide();
+
+
+
+
+ $("input[name='yingyudatikacheckboxinput'][value_id='" + value_id + "']").show();
$("select[name='yingyudatikaselect'][value_id='" + value_id + "']").show();
$("span[name='yingyudatikatitle'][value_id='" + value_id + "']").show();
$("span[name='yingyudatikaunit'][value_id='" + value_id + "']").show();
+
+ $("input[name='kexuedatikacheckboxinput'][value_id='" + value_id + "']").show();
$("select[name='kexuedatikaselect'][value_id='" + value_id + "']").show();
$("span[name='kexuedatikatitle'][value_id='" + value_id + "']").show();
$("span[name='kexuedatikaunit'][value_id='" + value_id + "']").show();
+
+ $("input[name='pingdedatikacheckboxinput'][value_id='" + value_id + "']").show();
$("select[name='pingdedatikaselect'][value_id='" + value_id + "']").show();
$("span[name='pingdedatikatitle'][value_id='" + value_id + "']").show();
$("span[name='pingdedatikaunit'][value_id='" + value_id + "']").show();
+
+ $("input[name='lishidatikacheckboxinput'][value_id='" + value_id + "']").hide();
$("select[name='lishidatikaselect'][value_id='" + value_id + "']").hide();
$("span[name='lishidatikatitle'][value_id='" + value_id + "']").hide();
$("span[name='lishidatikaunit'][value_id='" + value_id + "']").hide();
+
+ $("input[name='dilidatikacheckboxinput'][value_id='" + value_id + "']").hide();
$("select[name='dilidatikaselect'][value_id='" + value_id + "']").hide();
$("span[name='dilidatikatitle'][value_id='" + value_id + "']").hide();
$("span[name='dilidatikaunit'][value_id='" + value_id + "']").hide();
+
+ $("input[name='shengwudatikacheckboxinput'][value_id='" + value_id + "']").hide();
$("select[name='shengwudatikaselect'][value_id='" + value_id + "']").hide();
$("span[name='shengwudatikatitle'][value_id='" + value_id + "']").hide();
$("span[name='shengwudatikaunit'][value_id='" + value_id + "']").hide();
+
+ $("input[name='wulidatikacheckboxinput'][value_id='" + value_id + "']").hide();
$("select[name='wulidatikaselect'][value_id='" + value_id + "']").hide();
$("span[name='wulidatikatitle'][value_id='" + value_id + "']").hide();
$("span[name='wulidatikaunit'][value_id='" + value_id + "']").hide();
+
+ $("input[name='huaxuedatikacheckboxinput'][value_id='" + value_id + "']").hide();
$("select[name='huaxuedatikaselect'][value_id='" + value_id + "']").hide();
$("span[name='huaxuedatikatitle'][value_id='" + value_id + "']").hide();
$("span[name='huaxuedatikaunit'][value_id='" + value_id + "']").hide();
+
+ $("input[name='zhengzhidatikacheckboxinput'][value_id='" + value_id + "']").hide();
$("select[name='zhengzhidatikaselect'][value_id='" + value_id + "']").hide();
$("span[name='zhengzhidatikatitle'][value_id='" + value_id + "']").hide();
$("span[name='zhengzhidatikaunit'][value_id='" + value_id + "']").hide();
+
+ $("input[name='sixiangpingdedatikacheckboxinput'][value_id='" + value_id + "']").hide();
$("select[name='sixiangpingdedatikaselect'][value_id='" + value_id + "']").hide();
$("span[name='sixiangpingdedatikatitle'][value_id='" + value_id + "']").hide();
$("span[name='sixiangpingdedatikaunit'][value_id='" + value_id + "']").hide();
+
+ $("input[name='dilidatikahebingcheckbox'][value_id='" + value_id + "']").hide();
+ $("input[name='lishidatikahebingcheckbox'][value_id='" + value_id + "']").hide();
+ $("input[name='shengwudatikahebingcheckbox'][value_id='" + value_id + "']").hide();
+ $("input[name='sixiangpingdedatikahebingcheckbox'][value_id='" + value_id + "']").hide();
+
+ }
+ else if ($(obj).val() == "涓冨勾绾�") {
$("tr[name='datika'][value_id='" + value_id + "']").show();
$("tr[name='shijuan'][value_id='" + value_id + "']").show();
diff --git a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js b/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
index 1b9df7a..d716142 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
@@ -263,7 +263,7 @@
}
}
}
- else if (Nianji == "涓夊勾绾�" || Nianji == "鍥涘勾绾�" || Nianji == "浜斿勾绾�" || Nianji == "鍏勾绾�") {
+ else if (Nianji == "涓夊勾绾�" || Nianji == "鍥涘勾绾�" || Nianji == "浜斿勾绾�" ) {
var numnn = $("input[name='yuwencheckboxinput'][value_id='" + (i + 1) + "']").val();
var yuwenselect = $("select[name='yuwenselect'][value_id='" + (i + 1) + "']").val();
if (numnn != "") {
@@ -367,6 +367,152 @@
}
}
}
+
+ else if (Nianji == "鍏勾绾�") {
+ var numnn = $("input[name='yuwencheckboxinput'][value_id='" + (i + 1) + "']").val();
+ var yuwenselect = $("select[name='yuwenselect'][value_id='" + (i + 1) + "']").val();
+ if (numnn != "") {
+ num = num + parseInt(numnn);
+ shijuannum = shijuannum + parseInt(numnn);
+
+ if (yuwenselect == "4P") {
+ shijuanpshu = shijuanpshu + 4;
+ } else if (yuwenselect == "6P") {
+ shijuanpshu = shijuanpshu + 6;
+ } else if (yuwenselect == "8P") {
+ shijuanpshu = shijuanpshu + 8;
+ } else if (yuwenselect == "6+4P") {
+ shijuanpshu = shijuanpshu + 10;
+ } else if (yuwenselect == "6+6P") {
+ shijuanpshu = shijuanpshu + 12;
+ } else if (yuwenselect == "8+4P") {
+ shijuanpshu = shijuanpshu + 12;
+ }
+ }
+ var numnnshuxue = $("input[name='shuxuecheckboxinput'][value_id='" + (i + 1) + "']").val();
+ var shuxueselect = $("select[name='shuxueselect'][value_id='" + (i + 1) + "']").val();
+ if (numnnshuxue != "") {
+ num = num + parseInt(numnnshuxue);
+ shijuannum = shijuannum + parseInt(numnnshuxue);
+
+ if (shuxueselect == "4P") {
+ shijuanpshu = shijuanpshu + 4;
+ } else if (shuxueselect == "6P") {
+ shijuanpshu = shijuanpshu + 6;
+ } else if (shuxueselect == "8P") {
+ shijuanpshu = shijuanpshu + 8;
+ } else if (shuxueselect == "6+4P") {
+ shijuanpshu = shijuanpshu + 10;
+ } else if (shuxueselect == "6+6P") {
+ shijuanpshu = shijuanpshu + 12;
+ } else if (shuxueselect == "8+4P") {
+ shijuanpshu = shijuanpshu + 12;
+ }
+ }
+ var numnnyingyu = $("input[name='yingyucheckboxinput'][value_id='" + (i + 1) + "']").val();
+ var yingyuselect = $("select[name='yingyuselect'][value_id='" + (i + 1) + "']").val();
+ if (numnnyingyu != "") {
+ num = num + parseInt(numnnyingyu);
+ shijuannum = shijuannum + parseInt(numnnyingyu);
+
+ if (yingyuselect == "4P") {
+ shijuanpshu = shijuanpshu + 4;
+ } else if (yingyuselect == "6P") {
+ shijuanpshu = shijuanpshu + 6;
+ } else if (yingyuselect == "8P") {
+ shijuanpshu = shijuanpshu + 8;
+ } else if (yingyuselect == "6+4P") {
+ shijuanpshu = shijuanpshu + 10;
+ } else if (yingyuselect == "6+6P") {
+ shijuanpshu = shijuanpshu + 12;
+ } else if (yingyuselect == "8+4P") {
+ shijuanpshu = shijuanpshu + 12;
+ }
+ }
+ var numnnpingde = $("input[name='pingdecheckboxinput'][value_id='" + (i + 1) + "']").val();
+ var pingdeselect = $("select[name='pingdeselect'][value_id='" + (i + 1) + "']").val();
+ if (numnnpingde != "") {
+ num = num + parseInt(numnnpingde);
+ shijuannum = shijuannum + parseInt(numnnyingyu);
+
+ if (pingdeselect == "4P") {
+ shijuanpshu = shijuanpshu + 4;
+ } else if (pingdeselect == "6P") {
+ shijuanpshu = shijuanpshu + 6;
+ } else if (pingdeselect == "8P") {
+ shijuanpshu = shijuanpshu + 8;
+ } else if (pingdeselect == "6+4P") {
+ shijuanpshu = shijuanpshu + 10;
+ } else if (pingdeselect == "6+6P") {
+ shijuanpshu = shijuanpshu + 12;
+ } else if (pingdeselect == "8+4P") {
+ shijuanpshu = shijuanpshu + 12;
+ }
+ }
+
+
+ var numnnkexue = $("input[name='kexuecheckboxinput'][value_id='" + (i + 1) + "']").val();
+ var kexueselect = $("select[name='kexueselect'][value_id='" + (i + 1) + "']").val();
+ if (numnnkexue != "") {
+ num = num + parseInt(numnnkexue);
+ shijuannum = shijuannum + parseInt(numnnkexue);
+
+ if (kexueselect == "4P") {
+ shijuanpshu = shijuanpshu + 4;
+ } else if (kexueselect == "6P") {
+ shijuanpshu = shijuanpshu + 6;
+ } else if (kexueselect == "8P") {
+ shijuanpshu = shijuanpshu + 8;
+ } else if (kexueselect == "6+4P") {
+ shijuanpshu = shijuanpshu + 10;
+ } else if (kexueselect == "6+6P") {
+ shijuanpshu = shijuanpshu + 12;
+ } else if (kexueselect == "8+4P") {
+ shijuanpshu = shijuanpshu + 12;
+ }
+ }
+
+
+ var numnnyuwendatika = $("input[name='yuwendatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
+ if (numnnyuwendatika != "") {
+ num = num + parseInt(numnnyuwendatika);
+ datikanum = datikanum + parseInt(numnnyuwendatika);
+
+ datikakshu = datikakshu + 1;
+ }
+ var numnnshuxuedatika = $("input[name='shuxuedatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
+ if (numnnshuxuedatika != "") {
+ num = num + parseInt(numnnshuxuedatika);
+ datikanum = datikanum + parseInt(numnnshuxuedatika);
+
+ datikakshu = datikakshu + 1;
+ }
+
+ var numnnyingyudatika = $("input[name='yingyudatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
+ if (numnnyingyudatika != "") {
+ num = num + parseInt(numnnyingyudatika);
+ datikanum = datikanum + parseInt(numnnyingyudatika);
+
+ datikakshu = datikakshu + 1;
+ }
+ var numnnkexuedatika = $("input[name='kexuedatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
+
+
+ if (numnnkexuedatika != "") {
+ num = num + parseInt(numnnkexuedatika);
+ datikanum = datikanum + parseInt(numnnkexuedatika);
+ datikakshu = datikakshu + 1;
+ }
+ var numnnpingdedatika = $("input[name='pingdedatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
+ if (numnnpingdedatika != "") {
+ num = num + parseInt(numnnpingdedatika);
+ datikanum = datikanum + parseInt(numnnpingdedatika);
+ }
+
+
+
+
+ }
else if (Nianji == "涓冨勾绾�") {
var numnn = $("input[name='yuwencheckboxinput'][value_id='" + (i + 1) + "']").val();
var yuwenselect = $("select[name='yuwenselect'][value_id='" + (i + 1) + "']").val();
--
Gitblit v1.9.1