Merge branch 'master' into Liudl

bklLiudl

2024-03-19 16ae0857633ee15170ed63d3e22c380a9350148c

 HTML/views/WareHouseSetting/StorageLegend.html

@@ -152,18 +152,18 @@
                  <!-- 储位图例 -->
                  <table style="margin:0 auto;">
                     <tr>
                        <td><button class="btnShow five" disabled></button></td>
                        <td>移出中</td>
                        <td><button class="btnShow four" disabled></button></td>
                        <td>移入中</td>
                        <td><button class="btnShow three" disabled></button></td>
                        <td>出库中</td>
                        <td><button class="btnShow two" disabled></button></td>
                        <td>入库中</td>
                        <td><button class="btnShow one" disabled></button></td>
                        <td>有物品</td>
                        <td><button class="btnShow zero" disabled></button></td>
                        <td>空库位</td>
                        <td><button class="btnShow one" disabled></button></td>
                        <td>有物品</td>
                        <td><button class="btnShow two" disabled></button></td>
                        <td>入库中</td>
                        <td><button class="btnShow three" disabled></button></td>
                        <td>出库中</td>
                        <td><button class="btnShow four" disabled></button></td>
                        <td>移入中</td>
                        <td><button class="btnShow five" disabled></button></td>
                        <td>移出中</td>
                        <td><button class="btnShow filg" disabled></button></td>
                        <td>损坏\屏蔽</td>
                     </tr>
@@ -574,11 +574,11 @@
                           
                           //移入中 4
                           if (statu.Status == 4) {
                              html += '<td style="height:auto;width:auto"><button value=' + statu.LocatNo + '  class="btnShow four" style="height:' + height3 + 'px;width:' + svmwidth + 'px"></button></td>'
                              html += '<td><button value=' + statu.LocatNo + '  class="btnShow four"></button></td>'
                           }
                           //移出中 5
                           if (statu.Status == 5) {
                              html += '<td style="height:auto;width:auto"><button value=' + statu.LocatNo + '  class="btnShow five" style="height:' + height3 + 'px;width:' + svmwidth + 'px"></button></td>'
                              html += '<td><button value=' + statu.LocatNo + '  class="btnShow five"></button></td>'
                           }

                        } else {
@@ -671,7 +671,7 @@
                              { value: value[3], name: key[3] }, //出库中
                              { value: value[4], name: key[4] }, //移入中
                              { value: value[5], name: key[5] }, //移出中
                              { value: value[6], name: key[4] }, //损坏\屏蔽
                              { value: value[6], name: key[6] }, //损坏\屏蔽
                           ],
                        // emphasis: {
                        //    itemStyle: {
@@ -775,6 +775,24 @@
                  {
                     status3.push(0)
                  }
                  if (status4.length == 0)
                  {
                     status4.push(0)
                     status4.push(0)
                  }
                  else
                  {
                     status4.push(0)
                  }
                  if (status5.length == 0)
                  {
                     status5.push(0)
                     status5.push(0)
                  }
                  else
                  {
                     status5.push(0)
                  }
                  if (status6.length == 0)
                  {
                     status6.push(0)