Merge branch 'master' into csc

Demo

2024-07-17 3a9b5dcd5dd6ed033f80f1696b07135635b3e9f8

 HTML/views/ASNSetting/SelMaterials.html

@@ -32,6 +32,7 @@
                           <option value="4">车间余料退回入库</option>
                           <option value="5">其它入库</option>
                           <option value="6">代储入库</option>
                           <option value="7">寄存入库</option>
                        </select>
                     </div>
                  </div>