1、床垫报价-修复清单补充审核后能够取消业务下单问题

JLHHJSvr/Excutor/SaveMattressAuditingExcutor.cs

@@ -43,7 +43,7 @@ namespace JLHHJSvr.Excutor
                         foreach (int itemid in request.mattressids)
                         {
                             var mattressInfo = new u_mattress() { mattressid = itemid };
-                            if (DbSqlHelper.SelectOne(cmd, mattressInfo, "flag, xd_flag, yw_flag, js1_flag,mattresscode, parentid") != 1)
+                            if (DbSqlHelper.SelectOne(cmd, mattressInfo, "flag, xd_flag, yw_flag, js1_flag, js2_flag, mattresscode, parentid") != 1)
                             {
                                 rslt.ErrMsg = "查找报价单据失败：" + itemid;
                                 return;
@@ -119,6 +119,11 @@ namespace JLHHJSvr.Excutor
                                         rslt.ErrMsg = "已产品补充审核，不能取消下单！（" + mattressInfo.mattresscode + ")";
                                         return;
                                     }
+                                    if (mattressInfo.js2_flag == 1)
+                                    {
+                                        rslt.ErrMsg = "已清单补充审核，不能取消下单！（" + mattressInfo.mattresscode + ")";
+                                        return;
+                                    }
                                     if (mattressInfo.xd_flag == 0)
                                     {
                                         rslt.ErrMsg = "未进行业务下单，不能取消下单！（" + mattressInfo.mattresscode + ")";