设备管理库区变更

app/Http/Controllers/TestController.php

@@ -163,7 +163,7 @@ class TestController extends Controller
     {
         return view("equipment.index");
         $path = '';
-        $id = 181;
+        $id = 190;
 
         $file = fopen($path, "r");
         $user=array();

app/Http/Controllers/WaybillController.php

@@ -749,7 +749,8 @@ SQL;
                     $list[$map[$summary->orderno]][28] = $summary->c_city;
                     $list[$map[$summary->orderno]][29] = $summary->c_district;
                     $list[$map[$summary->orderno]][30] = $summary->c_address1;
-                    $list[$map[$summary->orderno]][31] += is_numeric($summary->weight) ? $summary->weight : 0;
+                    $list[$map[$summary->orderno]][31] = (double)($list[$map[$summary->orderno]][31])+
+                        (is_numeric($summary->weight) ? $summary->weight : 0);
                     $list[$map[$summary->orderno]][32] += $summary->amount;
                 }
             }

resources/views/equipment/_repository.blade.php

@@ -0,0 +1,47 @@
+<div class="modal fade" id="repository" tabindex="-1" role="dialog" data-keyboard="false" aria-hidden="true">
+    <div class="modal-dialog modal-lg modal-dialog-centered" role="document">
+        <div class="modal-content">
+            <div class="modal-header row m-0">
+                <h5 class="font-weight-bold">新增库区</h5>
+            </div>
+            <div class="modal-body container">
+                <div class="form-group">
+                    <label for="warehouse">所属区域:</label>
+                    <select class="form-control" id="warehouse" v-model="repository.zoneGroup">
+                        <option v-for="zone in group" :value="zone.code">@{{ zone.code+'('+zone.name+')' }}</option>
+                    </select>
+                </div>
+                <div class="form-group">
+                    <label for="name">名称:</label>
+                    <input class="form-control" id="name" placeholder="名称"
+                           v-model="repository.name">
+                </div>
+                <div class="form-group">
+                    <label for="code">库区码:</label>
+                    <input class="form-control" id="code" placeholder="库区码"
+                           v-model="repository.code">
+                </div>
+                <div class="form-inline">
+                    <div class="form-check ml-2">
+                        <label class="form-check-label">
+                            <input class="form-check-input" type="checkbox" v-model="repository.packingSign">包材区
+                        </label>
+                    </div>
+                    <div class="form-check ml-2">
+                        <label class="form-check-label">
+                            <input class="form-check-input" type="checkbox" v-model="repository.isPicking">允许拣货
+                        </label>
+                    </div>
+                    <div class="form-check ml-2">
+                        <label class="form-check-label">
+                            <input class="form-check-input" type="checkbox" v-model="repository.isStocking">允许存储
+                        </label>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button class="pull-right btn btn-success" @click="addRepository()">确定新增</button>
+            </div>
+        </div>
+    </div>
+</div>

resources/views/equipment/_warehouseDetail.blade.php

@@ -0,0 +1,41 @@
+<div class="modal fade" id="warehouseDetail" tabindex="-1" role="dialog" data-keyboard="false" aria-hidden="true">
+    <div class="modal-dialog modal-lg modal-dialog-centered" role="document">
+        <div class="modal-content">
+            <div class="modal-header row m-0">
+                <h5 class="font-weight-bold">新增仓库层</h5>
+            </div>
+            <div class="modal-body container">
+                <div class="form-group">
+                    <label for="warehouse">仓库:</label>
+                    <select class="form-control" id="warehouse" v-model="warehouseDetail.warehouseId">
+                        <option v-for="w in ws" :value="w.id">@{{ w.name }}</option>
+                    </select>
+                </div>
+                <div class="form-group">
+                    <label for="layer">层数:</label>
+                    <input type="number" class="form-control" id="layer" step="1" min="1" placeholder="层数"
+                     v-model="warehouseDetail.layer">
+                </div>
+                <div class="form-group">
+                    <label for="ratio">缩放比例:</label>
+                    <input type="number" class="form-control" id="ratio" step="1" min="1" placeholder="比例值/%"
+                           v-model="warehouseDetail.ratio">
+                </div>
+                <div class="form-inline">
+                    <label for="width">宽:</label>
+                    <input type="number" step="0.01" class="form-control" id="width" placeholder="层宽"
+                           v-model="warehouseDetail.width">
+                    <label for="height" class="ml-3">高:</label>
+                    <input type="number" step="0.01" class="form-control" id="height" placeholder="层高"
+                           v-model="warehouseDetail.height">
+                    <label for="length" class="ml-3">长:</label>
+                    <input type="number" step="0.01" class="form-control" id="length" placeholder="层长"
+                           v-model="warehouseDetail.length">
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button class="pull-right btn btn-success" @click="addWarehouseDetail()">确定新增</button>
+            </div>
+        </div>
+    </div>
+</div>

resources/views/equipment/index.blade.php

@@ -71,9 +71,14 @@
                         <a role="menuitem" tabindex="-1" style="cursor: pointer" class="ml-3"
                            @click="selectedWarehouse(warehouse)">@{{ warehouse.name }}</a>
                     </li>
+                    <li role="presentation" class="text-center" @click="addWarehouseDetail()">
+                        <a role="menuitem" tabindex="-1" style="cursor: pointer" class="ml-3 text-primary"
+                           ><i class="fa fa-plus"></i> 新增</a>
+                    </li>
                 </ul>
             </div>
-            <p class="font-weight-bold p-0 mb-0 mt-5">位置</p>
+            <button class="btn btn-info mt-5 w-100 text-white" @click="openRepository()">新增库区</button>
+            <p class="font-weight-bold p-0 mb-0 mt-1">位置</p>
             <div class="row text-muted small">
                 <small class="col-6">X</small>
                 <small class="col-6">Y</small>
@@ -217,6 +222,8 @@
     </div>
     @include("equipment._detailInfo")
     @include("equipment._location")
+    @include("equipment._warehouseDetail")
+    @include("equipment._repository")
 </div>
 </body>
 <script src="{{ mix('js/app.js') }}"></script>
@@ -225,6 +232,10 @@
     var vue = new Vue({
         el:"#container",
         data:{
+            group:[],//库区列表
+            ws:[],//仓库列表
+            warehouseDetail:{},//当前操作的仓库
+            repository:{},//当前操作的库区
             warehouses:[], //仓库描述
             repositories:[],                                            //库区
             selected:"",                                                //当前选中的仓库ID
@@ -687,6 +698,122 @@
                     timeout:3000,
                 })
             },
+            showAddWarehouseDetail(){
+                if (this.ws.length>0){
+                    $("#warehouseDetail").modal("show");
+                    return;
+                }
+                $.ajax({
+                    url : this.baseUrl+"warehouse/getList",
+                    type : "get",
+                    dataType : "JSON",
+                    success : (res)=>{
+                        switch (res.code){
+                            case 200:
+                                this.ws = res.data;
+                                $("#warehouseDetail").modal("show");
+                                break;
+                            default:
+                                window.toast.error("仓库建立失败");
+                        }
+                    },
+                    error : (err)=>{
+                        window.tempTip.setIndex(999);
+                        window.tempTip.show("网络错误");
+                    },
+                    complete:(req,status)=>{
+                        this.isLoadLocation = false;
+                        if (status==='timeout'){
+                            window.toast.error("获取仓库超时");
+                        }
+                    },
+                    timeout:3000,
+                })
+            },
+            addWarehouseDetail(){
+                $.ajax({
+                    url : this.baseUrl+"warehouse/detail",
+                    type : "post",
+                    dataType : "JSON",
+                    headers:{'Content-Type':'application/json;charset=utf8'},
+                    data : JSON.stringify(this.warehouseDetail),
+                    success : (res)=>{
+                        switch (res.code){
+                            case 200:
+                                window.toast.success("仓库新建成功");
+                                this.warehouses = res.data;
+                                $("#warehouseDetail").modal("hide");
+                                break;
+                            default:
+                                window.toast.error(res.message);
+                        }
+                    },
+                    error : (err)=>{
+                        window.tempTip.setIndex(999);
+                        window.tempTip.show("网络错误");
+                    },
+                    timeout:3000,
+                })
+            },
+            openRepository(){
+                $.ajax({
+                    url : this.baseUrl+"repository/group",
+                    type : "get",
+                    dataType : "JSON",
+                    data:{id:this.selected},
+                    success : (res)=>{
+                        switch (res.code){
+                            case 200:
+                                this.group = res.data;
+                                $("#repository").modal("show");
+                                break;
+                            default:
+                                window.toast.error("获取区域失败");
+                        }
+                    },
+                    error : (err)=>{
+                        window.tempTip.setIndex(999);
+                        window.tempTip.show("网络错误");
+                    },
+                    complete:(req,status)=>{
+                        this.isLoadLocation = false;
+                        if (status==='timeout'){
+                            window.toast.error("获取区域超时");
+                        }
+                    },
+                    timeout:3000,
+                })
+            },
+            addRepository(){
+                $.ajax({
+                    url : this.baseUrl+"repository/addRepository",
+                    type : "post",
+                    dataType : "JSON",
+                    headers:{'Content-Type':'application/json;charset=utf8'},
+                    data:JSON.stringify(this.repository),
+                    success : (res)=>{
+                        switch (res.code){
+                            case 200:
+                                this.repositories.push(res.data);
+                                $("#repository").modal("hide");
+                                break;
+                            default:
+                                window.toast.error("库区建立失败");
+                        }
+                    },
+                    error : (err)=>{
+                        window.tempTip.setIndex(999);
+                        window.tempTip.show("网络错误");
+                    },
+                    complete:(req,status)=>{
+                        this.isLoadLocation = false;
+                        if (status==='timeout'){
+                            window.toast.error("建立库区超时");
+                        }
+                    },
+                    timeout:3000,
+                })
+            },
         },
     });
 </script>