Merge branch 'zzd' of ssh://was.baoshi56.com:10022/var/git/bswas

app/Services/StoreItemService.php

@@ -281,7 +281,7 @@ WHERE DOC_ASN_DETAILS.ASNNO = ? AND DOC_ASN_DETAILS.LINESTATUS IN ('30','40')
 GROUP BY (DOC_ASN_DETAILS.ASNLINENO,DOC_ASN_DETAILS.ASNNO) ORDER BY QTY DESC
 SQL;
         $detail = DB::connection("oracle")->selectOne(DB::raw($sql),[$asn,$barCode,$barCode,$barCode]);
-        if (!$asn)return null;
+        if (!$detail)return null;
         return StoreItem::query()->whereHas("store",function (Builder $query)use($asn){
             $query->where("asn_code",$asn);
         })->where("asn_line_code",$detail->asnlineno)->first();

resources/views/store/inStorage/cacheRackStorage.blade.php

@@ -11,16 +11,16 @@
                     </div>
                     <div class="form-group row">
                         <label for="asn" class="col-sm-2 col-3 text-right">ASN号:</label>
-                        <div tabindex="0" @keydown="enterVal($event,'asn')" class="form-control col-8 overflow-hidden" :contenteditable="!isOnlyKeyboardEnter" :class="errors.asn ? 'is-invalid' : ''"
-                             id="asn" @blur="checkAsn()">@{{ info.asn ? info.asn : '只需填写后几位，自动补充' }}</div>
+                        <div tabindex="0" @focus="()=>{this.focus='asn'}" @keydown="enterVal($event,'asn')" class="form-control col-8 overflow-hidden" :contenteditable="!isOnlyKeyboardEnter" :class="errors.asn ? 'is-invalid' : ''"
+                             id="asn" @blur="checkAsn()">@{{ info.asn ? info.asn : (focus=='asn' ? '' : '只需填写后几位，自动补充') }}</div>
                         <span class="invalid-feedback offset-2" role="alert" v-if="errors.asn">
                             <strong>@{{ errors.asn[0] }}</strong>
                         </span>
                     </div>
                     <div class="form-group row">
                         <label for="ide" class="col-sm-2 col-3 text-right">料箱号:</label>
-                        <div tabindex="0" @keydown="enterVal($event,'ide')" class="form-control col-8 overflow-hidden" :contenteditable="!isOnlyKeyboardEnter" :class="errors.ide ? 'is-invalid' : ''"
-                             id="ide" @blur="checkIde()">@{{ info.ide ? info.ide : '只需填写后几位，自动补充' }}</div>
+                        <div tabindex="0" @focus="()=>{this.focus='ide'}" @keydown="enterVal($event,'ide')" class="form-control col-8 overflow-hidden" :contenteditable="!isOnlyKeyboardEnter" :class="errors.ide ? 'is-invalid' : ''"
+                             id="ide" @blur="checkIde()">@{{ info.ide ? info.ide : (focus=='ide' ? '' : '只需填写后几位，自动补充') }}</div>
                         <span class="invalid-feedback offset-2" role="alert" v-if="errors.ide">
                             <strong>@{{ errors.ide[0] }}</strong>
                         </span>
@@ -42,10 +42,12 @@
                         </span>
                     </div>
                     <div class="input-group row mt-5">
-                        <button type="submit" class="btn btn-success offset-2 col-6 col-sm-8" @click="checkInfo()">提交</button>
+                        <button type="submit" class="btn btn-success offset-2 col-8" @click="checkInfo()">提交</button>
+                    </div>
+                    <div class="row offset-2 col-8">
                         <div class="custom-control custom-checkbox mt-2 d-sm-none">
                             <input type="checkbox" class="custom-control-input" id="customCheck" v-model="isOnlyKeyboardEnter">
-                            <label class="custom-control-label" for="customCheck">键盘</label>
+                            <label class="custom-control-label" for="customCheck">隐藏虚拟键盘</label>
                         </div>
                     </div>
                 </div>
@@ -104,6 +106,7 @@
                     asn:"",
                     ide:"",
                 },
+                focus:"",
                 errors:{},
                 shelfOccupy:{},
                 selectedBox:{},
@@ -214,12 +217,14 @@
                     this.before.ide = 'IDE000000';
                 },
                 checkAsn(){
+                    this.focus = "";
                     if(!this.info.asn)return;
                     let len = this.info.asn.length;
                     if (len<13)this.info.asn = this.before.asn.substr(0,13-len)+this.info.asn;
                     if (!this.info.ide)document.getElementById("ide").focus();
                 },
                 checkIde(){
+                    this.focus = "";
                     if(!this.info.ide)return;
                     let len = this.info.ide.length;
                     if (len<10)this.info.ide = this.before.ide.substr(0,10-len)+this.info.ide;

resources/views/store/inStorage/halfChestStorage.blade.php

@@ -12,36 +12,36 @@
                     </div>
                     <div class="form-group row">
                         <label for="asn" class="col-sm-2 col-3 text-right">ASN号:</label>
-                        <div tabindex="0" @keydown="enterVal($event,'asn')" class="form-control col-8 overflow-hidden"
+                        <div tabindex="0" @focus="()=>{this.focus='asn'}" @keydown="enterVal($event,'asn')" class="form-control col-8 overflow-hidden"
                              :contenteditable="!isOnlyKeyboardEnter" :class="errors.asn ? 'is-invalid' : ''"
-                             id="asn" @blur="checkAsn()">@{{ info.asn ? info.asn : '只需填写后几位，自动补充' }}</div>
+                             id="asn" @blur="checkAsn()">@{{ info.asn ? info.asn : (focus=='asn' ? '' : '只需填写后几位，自动补充') }}</div>
                         <span class="invalid-feedback offset-2" role="alert" v-if="errors.asn">
                             <strong>@{{ errors.asn[0] }}</strong>
                         </span>
                     </div>
                     <div class="form-group row">
                         <label for="station" class="col-sm-2 col-3 text-right">库位:</label>
-                        <div tabindex="0" @keydown="enterVal($event,'station')" class="form-control col-8 overflow-hidden"
+                        <div tabindex="0" @focus="()=>{this.focus='station'}" @keydown="enterVal($event,'station')" class="form-control col-8 overflow-hidden"
                              :contenteditable="!isOnlyKeyboardEnter" :class="errors.station ? 'is-invalid' : ''"
-                             id="station" @blur="checkMaximum()">@{{ info.station ? info.station : '扫描货架条码' }}</div>
+                             id="station" @blur="checkMaximum()">@{{ info.station ? info.station : (focus=='station' ? '' : '扫描货架条码') }}</div>
                         <span class="invalid-feedback offset-2" role="alert" v-if="errors.station">
                             <strong>@{{ errors.station[0] }}</strong>
                         </span>
                     </div>
                     <div class="form-group row">
                         <label for="barCode" class="col-sm-2 col-3 text-right">条码:</label>
-                        <div tabindex="0" @keydown="enterVal($event,'barCode')" class="form-control col-8 overflow-hidden"
+                        <div tabindex="0" @focus="()=>{this.focus='barCode'}" @keydown="enterVal($event,'barCode')" class="form-control col-8 overflow-hidden"
                              :contenteditable="!isOnlyKeyboardEnter" :class="errors.barCode ? 'is-invalid' : ''"
-                             id="barCode" @blur="checkMaximum()">@{{ info.barCode ? info.barCode : '扫描商品条码' }}</div>
+                             id="barCode" @blur="checkMaximum()">@{{ info.barCode ? info.barCode : (focus=='barCode' ? '' : '扫描商品条码') }}</div>
                         <span class="invalid-feedback offset-2" role="alert" v-if="errors.barCode">
                             <strong>@{{ errors.barCode[0] }}</strong>
                         </span>
                     </div>
                     <div class="form-group row">
                         <label for="amount" class="col-sm-2 col-3 text-right">数量:</label>
-                        <div tabindex="0" @keydown="enterVal($event,'amount')" class="form-control col-8 overflow-hidden"
+                        <div tabindex="0" @focus="()=>{this.focus='amount'}" @keydown="enterVal($event,'amount')" class="form-control col-8 overflow-hidden"
                              :contenteditable="!isOnlyKeyboardEnter" :class="errors.amount ? 'is-invalid' : ''"
-                             id="amount" @blur="checkMaximum()">@{{ info.amount ? info.amount : (info.maximum!==undefined ? '最大可上：'+info.maximum : '') }}</div>
+                             id="amount" @blur="checkMaximum()">@{{ info.amount ? info.amount : (focus=='amount' ? '' : (info.maximum!==undefined ? '最大可上：'+info.maximum : '')) }}</div>
                         <span class="invalid-feedback offset-2" role="alert" v-if="errors.amount">
                             <strong>@{{ errors.amount[0] }}</strong>
                         </span>
@@ -95,6 +95,7 @@
                 before:{
                     asn:"",
                 },
+                focus:"",
                 errors:{},
                 ov:{},//溢出减量数值
                 checkSign:false,
@@ -180,6 +181,7 @@
                     this.before.asn = 'ASN'+yy+mm+dd+'000';
                 },
                 checkAsn(){
+                    this.focus = "";
                     if(!this.info.asn)return;
                     let len = this.info.asn.length;
                     if (len<13)this.info.asn = this.before.asn.substr(0,13-len)+this.info.asn;
@@ -190,16 +192,17 @@
                     this.checkSign = false;
                 },
                 checkMaximum(){
+                    this.focus = "";
                     if (!this.info.asn || !this.info.barCode || this.checkSign)return;
                     window.tempTip.postBasicRequest("{{url('store/inStorage/checkMaximum')}}",this.info,res=>{
                         this.info.maximum = res.maximum;
                         this.info.material_box_id = res.material_box_id;
                         this.info.material_box_model_id = res.material_box_model_id;
                         this.info.commodity_id = res.commodity_id;
-                        this.checkSign = true;
                         if(!this.info.amount)this.info.amount = res.maximum;
                         return "该库位最大可上数为"+res.maximum;
                     });
+                    this.checkSign = true;
                 },
                 enterVal(e,type){
                     if (e.keyCode === 229){e.preventDefault();return;}