Ver código fonte

1、修复副规格审核后主规格仍可以修改问题
2、修复清单没有获取报价版本问题

MY 7 horas atrás
pai
commit
229a0fa012

+ 2 - 2
JLHHJSvr/DataStore/web_mattress.xml

@@ -94,8 +94,8 @@
 		dijia_cost1,
 		dijia_cost2,
 		dijia_cost3,
-		dijia_cost4
-
+		dijia_cost4,
+		version
 		From u_mattress
 		LEFT JOIN (
 			SELECT

+ 1 - 1
JLHHJSvr/Excutor/GetMattressSubspecsExcutor.cs

@@ -44,7 +44,7 @@ namespace JLHHJSvr.Excutor
 
                     var subspecsList = new List<u_mattress>();
                     var result = new List<u_mattress_mx_subspecs>();
-                    var fields = "mattressid,mattress_width,mattress_length,mattress_height,mattressname,mattressrelcode";
+                    var fields = "mattressid,mattress_width,mattress_length,mattress_height,mattressname,mattressrelcode,version";
                     if (request.type == 0)
                     {
                         fields += ",mattresscode,parentid,erp_mtrlid,erp_mtrlcode,erp_configcodetype, erp_mtrlengname, erp_mtrlmode, erp_mtrlname, erp_mtrltype, erp_mtrltypeid, erp_mtrlunit, erp_piccode, xd_flag, flag, js1_flag";

+ 2 - 1
JLHHJSvr/Helper/MattressHelper.cs

@@ -2837,7 +2837,7 @@ namespace JLHHJSvr.Helper
         public void ProcessSubSpecs(u_mattress mattress, bool ifErp)
         {
             if (mattress.subspecsList == null) return;
-            var existing = GetMattressSubspecs(mattress.mattressid, "mattressid") ?? new List<u_mattress>();
+            var existing = GetMattressSubspecs(mattress.mattressid, "mattressid,mattresscode,flag,js1_flag") ?? new List<u_mattress>();
 
             foreach (var child in existing)
             {
@@ -2924,6 +2924,7 @@ namespace JLHHJSvr.Helper
             clone.mattress_width = child.mattress_width;
             clone.mattress_length = child.mattress_length;
             clone.mattress_height = child.mattress_height;
+            clone.version = child.version;
             clone.DynamicFields = child.DynamicFields;
             clone.mxList = parent.mxList?.Select(mx =>
             {