Merge branch 'master' into Liudl

bklLiudl

2024-07-15 fe2b27527084667a15c424ffba00052cbf35ef7f

 HTML/views/SOSetting/ExportNotice.html

@@ -62,33 +62,14 @@
                  <div class="layui-input-inline">
                     <select name="Type" id="Type" lay-filter="Type" lay-search>
                        <option value=""></option>
                        <!-- 23 -->
                        <!--JC26-->
                        <option value="0">成品出库</option>
                        <option value="1">领料出库</option>
                        <option value="2">抽检出库</option>
                        <option value="4">不合格品出库</option>
                        <option value="6">代储出库</option>
                        <option value="7">其他出库</option>
                        <!-- 24 -->
                        <!-- <option value="0">成品出库</option>
                           <option value="1">领料出库</option>
                           <option value="2">抽检出库</option>
                           <option value="3">物料取样出库</option>
                           <option value="4">不合格品出库</option>
                           <option value="5">中间品出库</option>
                           <option value="6">代储出库</option>
                           <option value="7">其他出库</option>
                           <option value="8">寄存出库</option> -->
                        <!-- 09 -->
                        <!-- <option value="0">标准销售出库</option>
                           <option value="1">非标销售出库</option>
                           <option value="2">标准调拨出库</option>
                           <option value="3">非标调拨出库</option> -->
                        <!-- 08 -->
                        <!-- <option value="0">成品出库</option>
                           <option value="1">原辅料出库</option>
                           <option value="2">不合格品出库</option>
                           <option value="3">取样出库</option> -->
                        <option value="5">中间品出库</option>
                        <!-- <option value="7">其他出库</option> -->
                        <option value="9">采购退货出库</option>								
                     </select>
                  </div>
               </div>
@@ -228,6 +209,8 @@
                                 return "其他出库";
                              case "8":
                                 return "寄存出库";
                              case "9":
                                 return "采购退货出库";
                              default:
                                 return "";
                           }