盘点列表

app/Commodity.php

@@ -10,7 +10,8 @@ class Commodity extends Model
 {
     use ModelTimeFormat;
     protected $fillable=['name','sku','owner_id','created_at','length','width','height','volumn'];
-    protected $appends=['barcode','owner_name','owner_code'];
+    protected $appends=['barcode'];
+//    protected $appends=['barcode','owner_name','owner_code'];
 
     public function barcodes()
     {

app/Http/Controllers/InventoryAccountController.php

@@ -56,9 +56,7 @@ class InventoryAccountController extends Controller
         if (!Gate::allows('库存管理-盘点')){return redirect(url('/')); }
         if (!$id) return ['success'=>false,'data'=>'参数错误!'];
         $inventoryAccount=InventoryAccount::with('owner')->find($id);
-        $inventoryAccountMissions=InventoryAccountMission::with(['commodity'=>function($query){
-           return $query->with(['barcodes']);
-        }])->where('inventory_account_id',$id)->orderBy('difference_amount','desc')->get();
+        $inventoryAccountMissions=InventoryAccountMission::with('commodity.barcodes')->where('inventory_account_id',$id)->orderBy('difference_amount','desc')->get();
         return view('inventory.stockInventory.inventoryMission',compact('inventoryAccount','inventoryAccountMissions'));
     }
 

app/Http/Controllers/InventoryController.php

@@ -30,7 +30,7 @@ class InventoryController extends Controller
         $TOLocation=$request->input('TOLocation');
         $LotAtt05=$request->input('LotAtt05');
         $LotAtt02_start=$request->input('LotAtt02_start');
-        $descr_c=$request->input('descr_c');
+        $customerid=$request->input('customerid');
         $SKU=$request->input('SKU');
         $ALTERNATE_SKU1=$request->input('ALTERNATE_SKU1');
         $LotAtt02_end=$request->input('LotAtt02_end');
@@ -46,6 +46,15 @@ class InventoryController extends Controller
         if ($date_end) $sql.=" and addtime < to_date('".$date_end." 23:59:59','yyyy-mm-dd hh24:mi:ss') ";
         if ($TOLocation)$sql .= " and TOLocation like '".$TOLocation."' ";
         if ($SKU)$sql.=" and FMSKU like '".$SKU."' ";
+        if ($customerid){
+            $sql .= ' and TOCustomerID in (';
+            $arr = explode(',',$customerid);
+            foreach ($arr as $index => $data){
+                if ($index != 0)$sql .= ',';
+                $sql .= "'".$data."'";
+            }
+            $sql .= ') ';
+        }
         $sql.=' group by TOCustomerID, TOLocation,FMSKU,FMLotNum union all ';
         $sql.=' select FMLotNum,FMSKU,FMCUSTOMERID 客户,sum(FMQty_Each) as 移出数量, 0 as 移入数量, FMLOCATION as 库位 ';
         $sql.=" from ACT_Transaction_Log where TransactionType='SO' ";
@@ -53,6 +62,15 @@ class InventoryController extends Controller
         if ($date_end) $sql.=" and addtime < to_date('".$date_end." 23:59:59','yyyy-mm-dd hh24:mi:ss') ";
         if ($TOLocation)$sql .= " and FMLOCATION like '".$TOLocation."' ";
         if ($SKU)$sql.=" and FMSKU like '".$SKU."' ";
+        if ($customerid){
+            $sql .= ' and FMCUSTOMERID in (';
+            $arr = explode(',',$customerid);
+            foreach ($arr as $index => $data){
+                if ($index != 0)$sql .= ',';
+                $sql .= "'".$data."'";
+            }
+            $sql .= ') ';
+        }
         $sql.=' group by FMCustomerID, FMLocation,FMSKU,FMLotNum union all ';
         $sql.=' select FMLotNum,FMSKU,FMCUSTOMERID 客户,sum(FMQty_Each) as 移出数量,0 as 移入数量, FMLocation as 库位 ';
         $sql.=" from ACT_Transaction_Log  where TransactionType='MV' ";
@@ -60,6 +78,15 @@ class InventoryController extends Controller
         if ($date_end) $sql.=" and addtime < to_date('".$date_end." 23:59:59','yyyy-mm-dd hh24:mi:ss') ";
         if ($TOLocation)$sql .= " and FMLocation like '".$TOLocation."' ";
         if ($SKU)$sql.=" and FMSKU like '".$SKU."' ";
+        if ($customerid){
+            $sql .= ' and FMCUSTOMERID in (';
+            $arr = explode(',',$customerid);
+            foreach ($arr as $index => $data){
+                if ($index != 0)$sql .= ',';
+                $sql .= "'".$data."'";
+            }
+            $sql .= ') ';
+        }
         $sql.=' group by FMLocation,FMCUSTOMERID,FMSKU,FMLotNum union all ';
         $sql.=' select FMLotNum,FMSKU,TOCustomerID 客户,0 as 移出数量,sum(TOQty_Each)as 移入数量, TOLocation as 库位 ';
         $sql.=" from ACT_Transaction_Log where TransactionType='MV' ";
@@ -67,6 +94,15 @@ class InventoryController extends Controller
         if ($date_end) $sql.=" and addtime < to_date('".$date_end." 23:59:59','yyyy-mm-dd hh24:mi:ss') ";
         if ($TOLocation)$sql .= " and TOLocation like '".$TOLocation."' ";
         if ($SKU)$sql.=" and FMSKU like '".$SKU."' ";
+        if ($customerid){
+            $sql .= ' and TOCustomerID in (';
+            $arr = explode(',',$customerid);
+            foreach ($arr as $index => $data){
+                if ($index != 0)$sql .= ',';
+                $sql .= "'".$data."'";
+            }
+            $sql .= ') ';
+        }
         $sql.=' group by TOLocation,TOCustomerID,FMSKU,FMLotNum)stockLog ';
         $sql.=' left join BAS_Customer customer on customer.CustomerID=stockLog.客户 ';
         $sql.=' left join BAS_SKU sku on sku.SKU=stockLog.FMSKU and sku.CUSTOMERID=stockLog.客户 ';
@@ -80,15 +116,6 @@ class InventoryController extends Controller
         if ($LotAtt05)$sql .=" and 属性仓 like '".$LotAtt05."' ";
         if ($LotAtt02_start)$sql.=" and 失效日期 >='".$LotAtt02_start." 00:00:00' ";
         if ($LotAtt02_end)$sql.=" and 失效日期 <='".$LotAtt02_end." 23:59:59' ";
-        if ($descr_c){
-            $sql .= ' and 货主 in (';
-            $descr_cs = explode(',',$descr_c);
-            foreach ($descr_cs as $index => $descr_c){
-                if ($index != 0)$sql .= ',';
-                $sql .= "'".$descr_c."'";
-            }
-            $sql .= ') ';
-        }
         if ($ALTERNATE_SKU1)$sql.=" and 产品条码 like '".$ALTERNATE_SKU1."' ";
         if ($page&&$paginate)$sql.="  and ROWNUM<='".$page*$paginate."'";
         $sql.=' )  ';
@@ -149,7 +176,7 @@ class InventoryController extends Controller
         $paginate=$request->input('paginate')??50;
         $oracleActTransactingLogs=$this->conditionQuery($request,$page,$paginate);
         $oracleActTransactingLogs=json_encode($oracleActTransactingLogs);
-        $owners=OracleBasCustomer::select('descr_c')->where('customer_type','OW')->where('active_flag','Y')->get();
+        $owners=OracleBasCustomer::select('descr_c','customerid')->where('customer_type','OW')->where('active_flag','Y')->get();
         $isTotalStock=false;
         return view('inventory.statement.changeInventory',compact('oracleActTransactingLogs','page','owners','isTotalStock'));
     }

public/t.php

@@ -1,11 +1,8 @@
 <?php
 ;
-$arr=['a'=>'1', 'b',
-];
-var_dump(empty((int)('0.00')));
-var_dump((int)('0.00'));
-var_dump(empty((int)('1.00')));
-var_dump((int)('1.00'));
-var_dump(empty(0));
-var_dump(empty(0.00));
-var_dump(empty(1));
+?>
+<script>
+    (function t(){
+        alert(22);
+    })();
+</script>

resources/views/inventory/statement/changeInventory.blade.php

@@ -66,7 +66,7 @@
                 page:Number('{{$page}}'),
                 owners:[
                     @foreach($owners as $owner)
-                    {name:'{{$owner->descr_c}}',value:'{{$owner->descr_c}}'},
+                    {name:'{{$owner->customerid}}',value:'{{$owner->descr_c}}'},
                     @endforeach
                 ],
                 checkData:[],
@@ -89,7 +89,7 @@
                         {name:'TOLocation',type:'input',tip:'库位：糊模查找需要在左边打上%符号',placeholder: '库位'},
                         {name:'LotAtt05',type:'input',tip:'属性仓：糊模查找需要在左边打上%符号',placeholder: '属性仓'},
                         {name:'LotAtt02_start',type:'dateTime',tip:'选择显示失效日期的起始时间'},
-                        {name:'descr_c',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的客户'],
+                        {name:'customerid',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的客户'],
                             placeholder:['货主','定位或多选货主'],data:this.owners},
                     ],
                     [

resources/views/inventory/stockInventory/inventoryMission.blade.php

@@ -2,64 +2,72 @@
 @section('title')盘点-任务-{!! $inventoryAccount->id !!}@endsection
 
 @section('content')
-        @component('inventory.stockInventory.menu')
-            <li class="nav-item">
-                <a  class="nav-link" href="{{URL::current()}}" :class="{active:isActive('enterStockInventory',3)}">盘点中({!! $inventoryAccount->id !!})</a>
-            </li>
-        @endcomponent
+    @component('inventory.stockInventory.menu')
+        <li class="nav-item">
+            <a  class="nav-link" href="{{URL::current()}}" :class="{active:isActive('enterStockInventory',3)}">盘点中({!! $inventoryAccount->id !!})</a>
+        </li>
+    @endcomponent
     <div id="list" class="d-none container-fluid" >
-        <div class="mt-3 offset-1">
-        <span class="form-group  shadow-sm p-2 mb-5 bg-white rounded">
-            <label class=" font-weight-bold">货主:</label><span>@{{ inventory.owner.name }}</span>
-        </span>
-        <span class="form-group  shadow-sm p-2 mb-5 bg-white rounded">
-            <label class=" font-weight-bold">盘点单号:</label><span>@{{ inventory.id }}</span>
-        </span>
-        </div>
-
-        <div class="mt-3 offset-1">
-        <span class="form-group  shadow-sm p-2 mb-5 bg-white rounded">
-            <label class=" font-weight-bold">时间范围:</label><span>@{{ inventory.start_at }}—@{{ inventory.end_at }}</span>
-        </span>
+        <div class="mt-3">
 
-        <span class="form-group  shadow-sm p-2 mb-5 bg-white rounded" v-if="inventory.surplus!=0">
-            <label class=" font-weight-bold">已盘点:</label><span>@{{ inventory.processed }}/总数:@{{ inventory.total }}</span>
-        </span>
-        <span class="form-group  shadow-sm p-2 mb-5 bg-white rounded" v-if="inventory.surplus!=0">
-            <label class=" font-weight-bold">剩余数:</label><span>@{{ inventory.surplus }}</span>
+            <span class="mt-3" >
+                <button class="btn btn-sm" @click="listMode?listMode=false:listMode=true" :class="listMode?'btn-dark':'btn-outline-dark'">
+                    <span v-if="!listMode">切换为列表</span>
+                    <span v-if="listMode">切换为盘点</span>
+                </button>
+            </span>
+        <span class="form-group  mb-5">
+            <label class="text-muted">货主:</label><span class="font-weight-bold">@{{ inventory.owner.name }}</span>
         </span>
-        <span class="form-group  shadow-sm p-2 mb-5 bg-white rounded" v-if="inventory.surplus==0">
-            <label class=" font-weight-bold">盘点记录数:</label><span>@{{ inventory.total }}</span>
+            <span class="form-group  p-2 mb-5" class="text-muted">
+            <label >盘点单号:</label><span>@{{ inventory.id }}</span>
         </span>
-        <span class="form-group  shadow-sm p-2 mb-5 bg-white rounded" v-if="inventory.surplus==0">
-            <label class=" font-weight-bold">复盘剩余数:</label><span>@{{ inventory.check_surplus }}/复盘总数:@{{ inventory.total }}</span>
+            <span class="form-group p-2 mb-5">
+            <label class="text-muted">时间范围:</label><span>@{{ inventory.start_at }} 至 @{{ inventory.end_at }}</span>
         </span>
         </div>
 
+        <div class="mt-3">
+        <span class="h5">
+            <span class="form-group mb-5" v-if="inventory.surplus!=0">
+                <label class=" font-weight-bold">已盘点:</label><span>@{{ inventory.processed }}/总数:@{{ inventory.total }}</span>
+            </span>
+            <span class="form-group mb-5" v-if="inventory.surplus!=0">
+                <label class=" font-weight-bold">剩余数:</label><span>@{{ inventory.surplus }}</span>
+            </span>
+            <span class="form-group mb-5" v-if="inventory.surplus==0">
+                <label class=" font-weight-bold">盘点记录数:</label><span>@{{ inventory.total }}</span>
+            </span>
+            <span class="form-group mb-5" v-if="inventory.surplus==0">
+                <label class=" font-weight-bold">复盘剩余数:</label><span>@{{ inventory.check_surplus }}/复盘总数:@{{ inventory.total }}</span>
+            </span>
+            </span>
+        </div>
+
 
-        <div class="row offset-1 mt-3" >
-        <span class="btn  col-md-2 font-weight-bold"  style="cursor: default;max-width: 160px" :class="inventory.surplus!=0?'bg-info':'btn-outline-info disabled'">
+        <div class="mt-3" >
+        <span v-if="!listMode" class="btn  col-md-2 font-weight-bold"  style="cursor: default;max-width: 160px" :class="inventory.surplus!=0?'bg-info':'btn-outline-info disabled'">
             @{{ inventory.type }}
         </span>
-            <span class="btn  col-md-2 font-weight-bold" style="cursor: default;max-width: 160px" :class="inventory.surplus!=0?'btn-outline-info disabled':'bg-info'">复盘</span>
+            <span v-if="!listMode" class="btn  col-md-2 font-weight-bold" style="cursor: default;max-width: 160px" :class="inventory.surplus!=0?'btn-outline-info disabled':'bg-info'">复盘</span>
         </div>
 
-        <form id="form"  class="row mt-3 offset-1">
-            <div class="row form-inline" :class="inventory.surplus!=0?'row-cols-3':'row-cols-5'">
-        <span>
+
+        <form id="form"  class="mt-3 form-inline " v-if="!listMode" :class="inventory.surplus!=0?'row-cols-3':'row-cols-5'">
+        <span class="form-group">
             <label for="location" class="text-secondary font-weight-bold">请输库位</label>
             <input id="inventoryInput" name="location" type="text" class="form-control  input"  autocomplete="off" value="@if(old('location')){{old('location')}}@endif">
         </span>
-        <span>
+                <span class="form-group ml-4">
             <label for="barcode" class="text-secondary font-weight-bold">请输产品条码</label>
             <input id="barcode" name="barcode" type="text" value="@if(old('barcode')){{old('barcode')}}@endif" class="form-control  input" autocomplete="off" @blur="searchBarcode">
         </span>
-        <span>
+                <span class="form-group ml-4">
             <label for="count" class="text-secondary font-weight-bold">请输盘点数</label>
             <input type="text" id="count" name="count" class="form-control input" value="@if(old('count')){{old('count')}}@endif"  autocomplete="off">
         </span>
 
-        <span v-if="inventory.surplus==0">
+                <span v-if="inventory.surplus==0">
             <label for="count" class="text-secondary font-weight-bold">上一次盘点数</label>
             <span v-if="!inventoryMissionRecord.re_checked_amount">
                 <input type="text" id="count" name="count" v-model="inventoryMissionRecord.verified_amount" class="form-control  input" readonly>
@@ -68,11 +76,10 @@
                 <input type="text" id="count" name="count" v-model="inventoryMissionRecord.re_checked_amount" class="form-control  input" readonly>
             </span>
         </span>
-        <span v-if="inventory.surplus==0">
+                <span v-if="inventory.surplus==0">
             <label for="count" class="text-secondary font-weight-bold">盘点差异数</label>
             <input type="text" id="count" name="count" v-model="inventoryMissionRecord.difference_amount" class="form-control  input" readonly>
         </span>
-            </div>
         </form>
 
 
@@ -95,7 +102,7 @@
                 <th>盘点差异</th>
                 <th>分配数量</th>
             </tr>
-            <tr v-for="(inventoryMission,i) in inventoryMissions" v-if="inventoryMission.checked=='是'"  @click="selectedColor(inventoryMission.id)" :style="{'font-weight': inventory.id==selectedStyle?'bold':''}">
+            <tr v-for="(inventoryMission,i) in inventoryMissions" v-if="inventoryMission.checked=='是'||listMode"  @click="selectedColor(inventoryMission.id)" :style="{'font-weight': inventory.id==selectedStyle?'bold':''}">
                 <td>@{{ i+1 }}</td>
                 <td>@{{ inventoryMission.location }}</td>
                 <td v-if="inventoryMission.commodity">@{{ inventoryMission.commodity.name }}</td>
@@ -117,7 +124,7 @@
 
         <table class="table table-striped table-sm table-bordered table-hover p-0 d-block d-sm-none" style="background: rgb(255, 255, 255);" >
             <tbody>
-            <tr v-for="inventoryMission in inventoryMissions" v-if="inventoryMission.checked=='是'">
+            <tr v-for="inventoryMission in inventoryMissions" v-if="inventoryMission.checked=='是'||listMode">
                 <td style="filter:grayscale(30%); ">
                     <div  class="mt-3">
                         <div style="transform:scale(0.9)" class="pl-0">
@@ -125,9 +132,9 @@
                             <span class="mr-3 text-nowrap"><span class="font-weight-bold">产品名称：</span><span style="color:#af7651" v-if="inventoryMission.commodity">@{{ inventoryMission.commodity.name }}</span></span>
                             <span class="mr-3 text-nowrap"><span class="font-weight-bold">产品条码：</span><span style="color:#af7651" v-if="inventoryMission.commodity">@{{ inventoryMission.commodity.barcode }}</span></span>
                             <div v-if="inventory.surplus==0">
-                            <span class="mr-3 text-nowrap"><span style="color:#783000" class="font-weight-bold">盘点数量：</span><span style="color:#af7651">@{{ inventoryMission.verified_amount }}</span></span>
-                            <span class="mr-3 text-nowrap"><span style="color:#783000" class="font-weight-bold">复盘数量：</span><span style="color:#af7651">@{{ inventoryMission.re_checked_amount }}</span></span>
-                            <span class="mr-3 text-nowrap"><span style="color:#783000" class="font-weight-bold">盘点差异：</span><span >@{{ inventoryMission.difference_amount }}</span></span>
+                                <span class="mr-3 text-nowrap"><span style="color:#783000" class="font-weight-bold">盘点数量：</span><span style="color:#af7651">@{{ inventoryMission.verified_amount }}</span></span>
+                                <span class="mr-3 text-nowrap"><span style="color:#783000" class="font-weight-bold">复盘数量：</span><span style="color:#af7651">@{{ inventoryMission.re_checked_amount }}</span></span>
+                                <span class="mr-3 text-nowrap"><span style="color:#783000" class="font-weight-bold">盘点差异：</span><span >@{{ inventoryMission.difference_amount }}</span></span>
                             </div>
                         </div>
                     </div>
@@ -150,11 +157,23 @@
                 checkData: [],
                 selectedStyle:'',
                 inventoryMissionRecord:{},
+                listMode:false,
             },
             mounted: function () {
+                let _this=this;
                 $(".tooltipTarget").tooltip({'trigger': 'hover'});
                 $("#list").removeClass('d-none');
-                document.getElementById('inventoryInput').focus();
+
+                (function 焦点放置(){
+                    let inventoryInput=$('#inventoryInput')
+                    if(inventoryInput.length>0)
+                        $('#inventoryInput').focus()
+                })();
+                (function 初始化列表模式(){
+                    let listMode=getGetVal('listMode')
+                    if(listMode==='true'){_this.listMode=true;return;}
+                    _this.listMode=false;
+                })();
             },
             methods:{
                 selectedColor(id){
@@ -234,7 +253,7 @@
                 },
             }
         });
-       $("#form").on("keydown","input",function(){
+        $("#form").on("keydown","input",function(){
             let _this=this;
             let e = event || window.event;
             if(e && e.keyCode==13) {

resources/views/inventory/stockInventory/mission.blade.php

@@ -53,6 +53,7 @@
                 </td>
                 <td>
                     <span class="btn  btn-sm btn-outline-info" @click="enterStockInventory(inventory.id)">进入</span>
+                    <button class="btn btn-sm btn-outline-dark" href="{{url('inventory/stockInventory/enterStockInventory')}}/'+id?listMode=true;">查看</button>
                 </td>
                 <td >@{{ i+1 }}</td>
                 <td >@{{ inventory.id }}</td>
@@ -173,7 +174,7 @@
                         tempTip.show('生成盘点任务失败'+'   '+'请选择开始时间！');
                         return;
                     }
-                    tempTip.setDuration(99999);
+                    tempTip.setDuration(999999);
                     tempTip.waitingTip('生成任务中');
                     // if (_this.formData.owner_id.length<=0){
                     //     tempTip.setDuration(1000);
@@ -198,6 +199,7 @@
                             location.href='{{url('inventory/stockInventory/enterStockInventory')}}/'+inventory.id;
                         }
                     }).catch(function (err) {
+                            tempTip.cancelWaitingTip();
                             tempTip.setDuration(3000);
                             tempTip.show('生成盘点任务失败!'+'网络错误：' + err);
                         });

resources/views/maintenance/user/index.blade.php

@@ -18,9 +18,13 @@
                     <table class="table table-striped table-sm" id="headerParent">
                         <tr>
                             <th data_field="id">id</th>
-                            <th data_field="name">name</th>
-                            <th>xx</th>
-                            <th>xxz</th>
+                            <th data_field="name">名称</th>
+                            <th>角色</th>
+                            <th>工作组</th>
+                            <th></th>
+                            <th>EMAIL</th>
+                            <th>创建于</th>
+                            <th>操作</th>
                         </tr>
                         <tr id="header"></tr>
                         <tr v-for="user in users">