青岛代码修改

Models/AppBoxEntity/PasswordUtil.cs

@@ -26,6 +26,7 @@ namespace CK.SCP.Models.AppBoxEntity
         /// <returns></returns>
 		public static bool ComparePasswords(string dbPassword,string userPassword)
 		{
+		    
 			byte[] dbPwd = Convert.FromBase64String(dbPassword);
 			
 			byte[] hashedPwd = HashString(userPassword);

SCP/Global.asax.cs

@@ -37,6 +37,7 @@ namespace SCP
             if (context != null)
             {
                 context.Dispose();
+                Alert.Show("gg");
             }
         }
 

SCP/Views/青岛一汽法雷奥/PlanData/SCP_ASK.aspx.cs

@@ -332,7 +332,7 @@ namespace SCP.Views.青岛一汽法雷奥.PlanData
                 }
                 else
                 {
-                    Alert.Show(string.Join("<br>", ret.MessageList));
+                    Alert.Show("必填项为空",string.Join("<br>", ret.MessageList));
                 }
             }
             catch (Exception ex)

SCP/Views/青岛一汽法雷奥/SupplierData/SCP_ASK.aspx.cs

@@ -129,7 +129,7 @@ namespace SCP.Views.青岛一汽法雷奥.SupplierData
         {
             object[] rowDataKeys = Grid_V_TB_ASK.DataKeys[e.RowIndex];
             string AskBillNum = rowDataKeys[2] as string;
-            PageContext.RegisterStartupScript(Window1.GetShowReference(string.Format("../SCP_ASK_DETAIL.aspx?AskBillNum={0}", AskBillNum)));
+            PageContext.RegisterStartupScript(Window1.GetShowReference(string.Format("../SupplierData/SCP_ASK_DETAIL.aspx?AskBillNum={0}", AskBillNum)));
         }
 
         protected void Grid_V_TB_ASK_Sort(object sender, GridSortEventArgs e)

SCP/Views/青岛一汽法雷奥/SupplierData/SCP_ASN_CREATE.aspx.cs

@@ -230,8 +230,8 @@ namespace SCP.青岛一汽法雷奥.SupplierData
                         Alert.Show("日期填写错误!");
                         return;
                     }
-                    //if (_Batch1.ToString().Trim() != "" && ConvertHelper.To<decimal>(_Qty1)>0)
+                    if (_Batch1.ToString().Trim() != "" && ConvertHelper.To<decimal>(_Qty1) > 0)
-                    if (ConvertHelper.To<decimal>(_Qty1) > 0)
+                        if (ConvertHelper.To<decimal>(_Qty1) > 0)
                     {
                         V_TB_ASK_DETAIL _detail = ConvertHelper.GetObjectClone<V_TB_ASK_DETAIL>(_entity);
                         //IsBatch(_Batch1.ToString().Trim());

SCP/default.aspx

@@ -111,10 +111,10 @@
 
         for (var i = 0; obj.options.length; i++)
         {
-            if ('JZ1' == obj.options[i].value) {
+            if ('QDVALEO' == obj.options[i].value) {
                 obj.options[i].selected = true;
                 _factory = document.getElementById(_factoryValue);
-                _factory.value = 'JZ1';
+                _factory.value = 'QDVALEO';
             }
         }
   

SCP/grf/Pallet.grf

@@ -0,0 +1 @@
+BASE64rA0AAHictVdLb9tGED67QP8DwdwKg+BDokQLOuhpO5VUWZIto44Q0NRKXpjisstVbLf1sYeih6IoUATIf0iPPaRp/0zTNKf+hc4u35QUuGhjwRY5j29n5pvZXf/96vevPv5oTz5DNMDEkw9kUzEVXVHlfS4eoSUOGKIDAppe1TwqD886faN3ctg1xv3PW2bz8fmRcWYZXetwcNwsP26V+2bbGAxK1a7ZMc8b5mnJOql2LfHaMc1+qTsdNI3Gp42OqVdOz63GsGJWw8W6xGPyAQ9nTx7YKwRLvnn53R+vfxTqPXmMvwSZppZVVQ0lU4SXV+BTigWtK5sGCCSaUQLBvcAdX2P/ZI3onXzA6BoJ2ZBiD/KKlwuh9bIZ4eI5uwJYpRS+H0XrVBU9FHxGMfJYWLCe7c0Dx/ZRFGYPLVjfpksMSlXRQuGE+BuyEQfdkDYJY2SVESd5tBGzsXtI8TwJ+4rctIjbwx5Ev7DdAO0n8hG52ZA3CZ0nSYMZu3NRAClczGQuuY/iQg7YiTJGhi3iecjh+Y4ZFG4JLkNKnmEAq49PeoNW71jTFK025F0UMGmMnDXF7E469hak3uUB1E4DRKXjdj2wa8ceZth2pZbNbJcs69P++KnzxeXKZ7U2iKQxWVMH1TW9oqjw0bivBAs6aL6mSFoQCm/ItynY1BprRqQJtb3AtRmqT4Dh2tB2rhGEAazWS6pl1qaEXgfM5hnwGJrtspVE0cUukni/1Z/IT2SxVsdz6J0vrPliPKgoi4m9lG4wu5Ic4q5XHv9yQ9ibK+RJPgkCfOmiyLrfGI2ltHiRlMNN7nzUIisffC+xC6WqqzUIXdSOPoNKtRBleIEdnlPo1vB9l7+LHKB5PVYfdRrt6eh40oGMg+AGWKv3sUNJQBZMV9VwroA/0f1AFPAWIBeCkRjxJU1VpU+kBSUraTJ+emlTh8yRJFpEuryT1nguzVHgxCBdjFzovAvxthd2RjqpQ9t1ERusV3KouBdfs0xbtUTFYoDIP3YPlVq0VjKBFcWy1JIuhAJxlsWCyvIyJG0aj2lJ0VWzWt2Pmzdj20Kuu5lDHFoxDEiaIhT6xFtH5OAxSlKkFIvPOnALWNxVDOt+qoqyjVVaVpcfzlCWTmib2jd8Z/maP8BuIr7FDiKewl1jJie+9xnkEd8l1rxQWkYaB5HnpZAM2GFvjm5zrik/mtieNpfciqD/ZwRjO4L+cITSjhg0TS8/HKW8DcVQDFPVs9kkj7MtZQdS/mXN0/ZWS1XNeOhCuZbfWInyMPLrOLyx86ImbKjQJwTaU+5Y/CPn9JmjO5HFR/hvL/96/fO7F9+8e/VDzik+dS01Ps/TihbO9URRON+TAuSD2Tqzof/G3BYLks7vmJ8XTpPc5qNOEkv0WtEgW62u+Cla8Enmh7uuaaZZKShhunfqol4rK1Az0ygo4wZRlYplVMoF7RaOtl+0MtpdDL2Ho90sFXiKDMe+7YgrRXwDyhQC3QKI/Oe3z9++eP7215/efP+LVDxntgFv57OPVmQ3m5H2g3CpKeXqBh0Rk6aiWbD37GBSU0zNsMz/jUldq5Q/DJVww5pPqe1vDl1K5MWjhL1Hszx/mZdZYWJd6BA4nrLbc7rfxU+xaPb+28cEMxdt3BfU3E1B2Gy/JxxSsvYjjPRanbpuu0Hw3BsuXnJlH8/nHFv865GzyHhuZgB/4Pf+H3a3/EM=

SCP/grf/SendBill_Pallet.grf

@@ -0,0 +1 @@
+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

SCP/grf/Small_Material.grf

@@ -0,0 +1 @@
+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