床垫清单-修复未产品审核能生成L1编码问题

JLHHJSvr/Excutor/UpdateMtrlPriceExcutor.cs

@@ -32,7 +32,7 @@ namespace JLHHJSvr.Excutor
 
 
                 var mattress = new u_mattress();
-                if (DbSqlHelper.SelectOne(cmd, "u_mattress", "mattressid = @mattressid", new Dictionary<string, object>() { { "mattressid", request.mattressid } }, mattress, "erp_mtrlid,erp_mtrlcode, erp_mtrlname, erp_mtrlmode, erp_mtrltypeid, erp_mtrltype, erp_mtrlunit, erp_mtrlengname,nottax_factory_cost,dept_profitrate,dept_profitrate_rangli,commission,taxes,fob,extras_cost,mattresstypeid,mattresscode") != 1)
+                if (DbSqlHelper.SelectOne(cmd, "u_mattress", "mattressid = @mattressid", new Dictionary<string, object>() { { "mattressid", request.mattressid } }, mattress, "erp_mtrlid,erp_mtrlcode, erp_mtrlname, erp_mtrlmode, erp_mtrltypeid, erp_mtrltype, erp_mtrlunit, erp_mtrlengname,nottax_factory_cost,dept_profitrate,dept_profitrate_rangli,commission,taxes,fob,extras_cost,mattresstypeid,mattresscode,js1_flag") != 1)
                 {
                     rslt.ErrMsg = "床垫报价单匹配失败";
                     return;

JLHHJSvr/Helper/ERPHelper.cs

@@ -346,6 +346,12 @@ namespace JLHHJSvr.Helper
         {
             var errMsg = string.Empty;
 
+            if(mtrl.js1_flag == 0)
+            {
+                errMsg = $"床垫报价:{mtrl.mattresscode}未产品审核,请检查!";
+                return errMsg;
+            }
+
             if(mtrl.dijia_cost1 == null || mtrl.dijia_cost2 == null || mtrl.dijia_cost3 == null || mtrl.dijia_cost4 == null)
             {
                 errMsg = $"床垫报价:{mtrl.mattresscode}未生成底价,请检查!";

JLHWEB/src/views/erpapi/mattressInterface/index.vue

@@ -264,7 +264,19 @@ const action: detailAction[] = [
         ElMessage.warning(t("business.tips.mattress.records"));
         return;
       }
-      let list = curRecords.map(item => item.mattressid);
+      let list = [];
+      let code_list = [];
+      curRecords.forEach((item, index) => {
+        if (item.js1_flag === 0) {
+          code_list.push(item.mattresscode);
+        } else list.push(item.mattressid);
+      });
+
+      if (code_list.length > 0) {
+        ElMessage.warning(`床垫报价:${code_list.join(",")}未产品审核,请检查！`);
+        return;
+      }
+
       toCreateMtrl(1, list);
     }
   }),