diff --git a/CLQDYZ_XJFYView.aspx b/CLQDYZ_XJFYView.aspx
index 377b09a..990bda3 100644
--- a/CLQDYZ_XJFYView.aspx
+++ b/CLQDYZ_XJFYView.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" MasterPageFile="~/N_MODEL/Page/MasterSingleGrid.Master" AutoEventWireup="true"
+<%@ Page Language="C#" MasterPageFile="~/N_MODEL/Page/MasterSingleGrid.Master" AutoEventWireup="true"
     Codebehind="CLQDYZ_XJFYView.aspx.cs" Inherits="GThinking.N_XLXSBJ.CLQDYZ_XJFYView" Title="查看线径费用" %>
 
 <%@ MasterType VirtualPath="~/N_MODEL/Page/MasterSingleGrid.Master" %>
diff --git a/DRXLXHCPTXWH.aspx.cs b/DRXLXHCPTXWH.aspx.cs
index ced66d4..c9a42e9 100644
--- a/DRXLXHCPTXWH.aspx.cs
+++ b/DRXLXHCPTXWH.aspx.cs
@@ -161,15 +161,15 @@ namespace GThinking.N_XLXSBJ
 
                     if (sCellValue.Equals(""))
                         continue;
-                    
 
+                    int XH = 1;
                     SQL.Clear();
                     SQL.Add(@" insert into XLXSBJCPYS(XLXSBJCPYS_CPYT, XLXSBJCPYS_XLJBXHID, XLXSBJCPYS_DYDJID,XLXSBJCPYS_XXJGID,XLXSBJCPYS_WHR,XLXSBJCPYS_WHRID,XLXSBJCPYS_WHSJ)
                                                 values(:XLXSBJCPYS_CPYT,:XLXSBJCPYS_XLJBXHID,:XLXSBJCPYS_DYDJID,:XLXSBJCPYS_XXJGID,:XLXSBJCPYS_WHR,:XLXSBJCPYS_WHRID,:XLXSBJCPYS_WHSJ)");
                     SQL.ParamByName("XLXSBJCPYS_XLJBXHID").Value = sXLXHID;
                     SQL.ParamByName("XLXSBJCPYS_DYDJID").Value = sDYDJID;
                     SQL.ParamByName("XLXSBJCPYS_XXJGID").Value = sXLXHFJSX;
-                    SQL.ParamByName("XLXSBJCPYS_CPYT").Value = CMISproDataBase.GetMaxXH("DBERP", "XLXSBJCPYS", "XLXSBJCPYS_CPYT", string.Format(" XLXSBJCPYS_XLJBXHID='{0}' and  XLXSBJCPYS_XXJGID='{1}' ",sXLXHID,sXLXHFJSX))+1;
+                    SQL.ParamByName("XLXSBJCPYS_CPYT").Value = XH++;
                     SQL.ParamByName("XLXSBJCPYS_WHR").Value = tSession.UserName;
                     SQL.ParamByName("XLXSBJCPYS_WHRID").Value = tSession.UserId;
                     SQL.ParamByName("XLXSBJCPYS_WHSJ").Value = DateTime.Now;
diff --git a/N_XLXSBJA.suo b/N_XLXSBJA.suo
index 8c4c3d1..f377c17 100644
Binary files a/N_XLXSBJA.suo and b/N_XLXSBJA.suo differ
diff --git a/XLBJDUtils.cs b/XLBJDUtils.cs
index 5104540..26a925f 100644
--- a/XLBJDUtils.cs
+++ b/XLBJDUtils.cs
@@ -9472,15 +9472,17 @@ namespace GThinking.N_XLXSBJ
                         SQL.Add(" left join XLDTJMZHB on XLDTJMZHB_DTJMZHID=XLGGB_DTJMZHID ");
                         SQL.Add(" where XLXSBJDMX_BJDID=:pBJDID    ");
                         SQL.Add(" and exists(select 1 from V_XSBJJSJGB where V_XSBJJSJGB_ID=:pID and V_XSBJJSJGB_BJDID=:pBJDID and V_XSBJJSJGB_WGCPBZ<>'Y' and V_XSBJJSJGB_JGFBZ<>'Y' and  V_XSBJJSJGB_BJDID=XLXSBJDMX_BJDID  and V_XSBJJSJGB_BJDXH=XLXSBJDMX_XH ) ");
-                        SQL.Add(" and XLXSBJDMX_JLDW in ('Ã×','M') ");
-                        SQL.Add(" and (        ");
-                        SQL.Add(" ( XLXSBJDMX_BJSL<=1000 and XLDTJMZHB_DTJM1<=35 and XLDTJMZHB_DTJM1>=10 ) or       ");
-                        SQL.Add(" ( XLXSBJDMX_BJSL<=200 and XLDTJMZHB_DTJM1<=120 and XLDTJMZHB_DTJM1>=50 ) or       ");
-                        SQL.Add(" ( XLXSBJDMX_BJSL<=150 and XLDTJMZHB_DTJM1<=630 and XLDTJMZHB_DTJM1>=150 ) or        ");
-                        SQL.Add(" ( XLDTJMZHB_DTJM1 < 10 ) or       ");
-                        SQL.Add(" ( XLDTJMZHB_DTJM1> 35  and XLDTJMZHB_DTJM1<50 ) or       ");
-                        SQL.Add(" ( XLDTJMZHB_DTJM1> 120 and XLDTJMZHB_DTJM1< 150 ) or XLDTJMZHB_DTJM1> 630         ");
-                        SQL.Add("           ) ");
+                        SQL.Add(" and ( ");
+                        SQL.Add("    XLXSBJDMX_JLDW not in ('Ã×','M') ");
+                        SQL.Add("    or ( ");
+                        SQL.Add("        XLXSBJDMX_JLDW in ('Ã×','M') ");
+                        SQL.Add("        and not ( ");
+                        SQL.Add("            ( XLXSBJDMX_BJSL > 1000 and XLDTJMZHB_DTJM1 between 10 and 35 ) ");
+                        SQL.Add("            or ( XLXSBJDMX_BJSL > 200 and XLDTJMZHB_DTJM1 between 50 and 120 ) ");
+                        SQL.Add("            or ( XLXSBJDMX_BJSL > 150 and XLDTJMZHB_DTJM1 between 150 and 630 ) ");
+                        SQL.Add("        ) ");
+                        SQL.Add("    ) ");
+                        SQL.Add("  ) ");
                         SQL.Add(" and  " + CMISproDataBase.GetWhereEqual("XLXHB_DTCLID", sLcpList));
                         SQL.Add(" )sor on(XLXSBJDMX_BJDID=XLXSBJDJJYZ_BJDID and  XLXSBJDMX_XH=XLXSBJDJJYZ_XH)   ");
                         SQL.Add(" when matched then update set XLXSBJDJJYZ_YZZ" + i.ToString().PadLeft(2, '0') + "= 0 ");
diff --git a/obj/Debug/N_XLXSBJA.dll b/obj/Debug/N_XLXSBJA.dll
index 0d684c5..73758b8 100644
Binary files a/obj/Debug/N_XLXSBJA.dll and b/obj/Debug/N_XLXSBJA.dll differ
diff --git a/obj/Debug/N_XLXSBJA.pdb b/obj/Debug/N_XLXSBJA.pdb
index 7c9e4d6..41ccbd3 100644
Binary files a/obj/Debug/N_XLXSBJA.pdb and b/obj/Debug/N_XLXSBJA.pdb differ
diff --git a/obj/Debug/ResolveAssemblyReference.cache b/obj/Debug/ResolveAssemblyReference.cache
index 6a1462d..afc41e6 100644
Binary files a/obj/Debug/ResolveAssemblyReference.cache and b/obj/Debug/ResolveAssemblyReference.cache differ