1、修复刷新配置和刷新清单重复问题

2、修复刷新配置没有带出正确配置问题

JLHHJSvr/Excutor/RefreshMattressInterfaceExcutor.cs

@@ -34,8 +34,11 @@ namespace JLHHJSvr.Excutor
                 con.Open();
 
                 var copy_list = new List<u_mattress_interface>();
+                var interfaceHelper = HelperBase.GetHelper<InterfaceHelper>(cmd, new HelperBase.Context() { tokendata = tokendata });
 
-                var selectStr = @"SELECT mattressid
+                if (request.isPz == 1)
+                {
+                    var selectStr = @"SELECT mattressid
 	                            ,printid
 	                            ,itemname
 	                            ,bj_pzname
@@ -48,11 +51,12 @@ namespace JLHHJSvr.Excutor
 	                            ,ls_rate
 	                            ,bj_inputtype
                             FROM u_mattress_interface";
-                DbSqlHelper.SelectJoin(cmd, selectStr, "mattressid = @mattressid", new Dictionary<string, object>() { { "@mattressid", request.mattressid } }, "printid", "mattressid,printid,itemname,bj_pzname,bj_namemx,actual_size,sb_craft,actual_size_sb,erp_pzid,ss_rate,ls_rate,bj_inputtype", 0, 0, copy_list);
-
-                var interfaceHelper = HelperBase.GetHelper<InterfaceHelper>(cmd, new HelperBase.Context() { tokendata = tokendata });
+                    DbSqlHelper.SelectJoin(cmd, selectStr, "mattressid = @mattressid", new Dictionary<string, object>() { { "@mattressid", request.mattressid } }, "printid", "mattressid,printid,itemname,bj_pzname,bj_namemx,actual_size,sb_craft,actual_size_sb,erp_pzid,ss_rate,ls_rate,bj_inputtype", 0, 0, copy_list);
+                } else
+                {
+                    interfaceHelper.ImportMattressInterfaceList(request.mattressid.Value, copy_list);
+                }
 
-                interfaceHelper.ImportMattressInterfaceList(request.mattressid.Value, copy_list);
                 interfaceHelper.MattressInterfaceFindERPPz(request.mattressid.Value, copy_list, request.configcodetype);
                 rslt.mxList = copy_list;
             }

JLHHJSvr/Excutor/RefreshMattressInterfaceQdExcutor.cs

@@ -45,7 +45,9 @@ namespace JLHHJSvr.Excutor
                 var copy_list = new List<u_mattress_interface_qd>();
                 var interfaceHelper = HelperBase.GetHelper<InterfaceHelper>(cmd, new HelperBase.Context() { tokendata = tokendata });
 
-                var selectStr = @"SELECT u_mattress_interface_qd.mattressid 
+                if(request.isPz == 1)
+                {
+                    var selectStr = @"SELECT u_mattress_interface_qd.mattressid 
 	                            ,u_mattress_interface_qd.printid 
 	                            ,u_mattress_interface_qd.itemname 
 	                            ,u_mattress_interface_qd.bj_pzname 
@@ -66,10 +68,10 @@ namespace JLHHJSvr.Excutor
 	                            ,ISNULL(u_mattress_interface_qd.formulaid, 0) AS formulaid
                             FROM u_mattress_interface_qd
                             LEFT JOIN u_mtrl_price ON u_mtrl_price.mtrlid = u_mattress_interface_qd.mtrlid";
-                var outputFields = "mattressid,printid,itemname,bj_pzname,bj_pzname_mx,bj_pzname_mx_mx,mtrlid,erp_mtrlid,useqty,dscrp,mtrlname,actual_useqty,qd_actual_size,qd_pfgroupqty,wrkgrpid,ss_rate,ls_rate,sh_rate,formulaid";
-                DbSqlHelper.SelectJoin(cmd, selectStr, "mattressid = @mattressid", new Dictionary<string, object>() { { "@mattressid", request.mattressid } }, "printid", outputFields, 0, 0, copy_list);
+                    var outputFields = "mattressid,printid,itemname,bj_pzname,bj_pzname_mx,bj_pzname_mx_mx,mtrlid,erp_mtrlid,useqty,dscrp,mtrlname,actual_useqty,qd_actual_size,qd_pfgroupqty,wrkgrpid,ss_rate,ls_rate,sh_rate,formulaid";
+                    DbSqlHelper.SelectJoin(cmd, selectStr, "mattressid = @mattressid", new Dictionary<string, object>() { { "@mattressid", request.mattressid } }, "printid", outputFields, 0, 0, copy_list);
 
-                if (request.isPz != 1)
+                } else
                 {
                     interfaceHelper.ImportMattressInterfaceQdList(request.mattressid.Value, copy_list);
                 }

JLHWEB/src/views/erpapi/mattressInterface/hooks/index.tsx

@@ -1869,8 +1869,12 @@ export const useHooks = (t?: any) => {
 
     //  inputtype 0 - 选择 1 - 录入 2 - 带出
     if (isPz === 0) {
-      // 刷新配置 FEAT: 只刷新带出类型的配置，只刷新明细名称列，如果有新增的，需要补齐。
-      visibleData.forEach(mx => copyMap.set(`${mx.erp_pzid}`, mx));
+      // 刷新配置 FEAT: 只刷新【带出】类型的配置，只刷新明细名称列，并检查核价是否有新增的【带出】类型资料，添加到配置
+      visibleData.forEach(mx => {
+        if (mx.bj_inputtype === 2) {
+          copyMap.set(`${mx.erp_pzid}`, mx);
+        }
+      });
 
       const PRESERVE_PROPS = [
         "bj_inputtype",
@@ -1909,10 +1913,10 @@ export const useHooks = (t?: any) => {
 
       state.mattressQDList = visibleData.map((mx: any) => mx);
     } else {
+      // 重新生成：  FEAT: 删除所有已经填写的【录入】和【选择)项目，根据核价资料，重新生成所有的【带出】资料
       const PRESERVE_PROPS = ["actual_size", "sb_craft", "actual_size_sb", "ss_rate", "ls_rate"];
 
       visibleData.forEach(mx => copyMap.set(`${mx.erp_pzid}`, mx));
-
       state.mattressYWList = res.mxList.map(mx => {
         const key = `${mx.erp_pzid}`;
         if (copyMap.has(key)) {