指定分配增加限制

app/Http/Controllers/TestController.php

@@ -26,6 +26,7 @@ use App\OracleActAllocationDetails;
 use App\OracleBasCustomer;
 use App\OracleBasSKU;
 use App\OracleDOCASNHeader;
+use App\OracleDOCOrderDetail;
 use App\OracleDOCOrderHeader;
 use App\OracleDocOrderPackingSummary;
 use App\OracleDOCWaveDetails;
@@ -163,7 +164,17 @@ sql;
 
     public function zzd()
     {
-        return view("test");
+        $item = [
+            "订单编号" => "SO210120009746",
+            "商品条码" => "3046920028004",
+        ];
+        $detail = OracleDOCOrderDetail::query()->select("DOC_ORDER_DETAILS.customerid","DOC_ORDER_DETAILS.sku","DOC_ORDER_DETAILS.orderno","DOC_ORDER_DETAILS.orderlineno","sostatus")
+            ->where("DOC_ORDER_DETAILS.orderno",$item["订单编号"])
+            ->whereHas("sku",function ($query)use($item){
+                /** @var Builder $query */
+                $query->where("alternate_sku1",$item["商品条码"]);
+            })->leftJoin("DOC_ORDER_HEADER","DOC_ORDER_DETAILS.ORDERNO","=","DOC_ORDER_HEADER.ORDERNO")->first();
+        dd($detail);
     }
 
     public function mergeCarrier()

app/Imports/UpdatePickZone.php

@@ -71,16 +71,20 @@ class UpdatePickZone implements ToCollection,WithHeadingRow
                 $errors[] = "第“" . ($index + 2) . "”行不存在日期";
                 continue;
             }
-            $detail = OracleDOCOrderDetail::query()->select("customerid","sku","orderno","orderlineno")
-                ->where("orderno",$item["订单编号"])
+            $detail = OracleDOCOrderDetail::query()->select("DOC_ORDER_DETAILS.customerid","DOC_ORDER_DETAILS.sku","DOC_ORDER_DETAILS.orderno","DOC_ORDER_DETAILS.orderlineno","sostatus")
+                ->where("DOC_ORDER_DETAILS.orderno",$item["订单编号"])
                 ->whereHas("sku",function ($query)use($item){
                     /** @var Builder $query */
                     $query->where("alternate_sku1",$item["商品条码"]);
-                })->first();
+                })->leftJoin("DOC_ORDER_HEADER","DOC_ORDER_DETAILS.ORDERNO","=","DOC_ORDER_HEADER.ORDERNO")->first();
             if (!$detail){
                 $errors[] = "第“" . ($index + 2) . "”行未知订单商品";
                 continue;
             }
+            if ($detail->sostatus != '00'){
+                $errors[] = "第“" . ($index + 2) . "”行订单状态不为创建订单";
+                continue;
+            }
             $sql = "select BAS_ZONE.DESCR,INV_LOT_LOC_ID.LOCATIONID,INV_LOT_LOC_ID.LOTNUM,BAS_LOCATION.PICKZONE,(INV_LOT_LOC_ID.QTY-INV_LOT_LOC_ID.QTYALLOCATED-QTYONHOLD-QTYRPOUT-QTYMVOUT) AS qty from INV_LOT_ATT LEFT JOIN
                         INV_LOT_LOC_ID ON INV_LOT_ATT.LOTNUM = INV_LOT_LOC_ID.LOTNUM LEFT JOIN BAS_LOCATION ON INV_LOT_LOC_ID.LOCATIONID = BAS_LOCATION.LOCATIONID
                     LEFT JOIN BAS_ZONE ON BAS_LOCATION.PICKZONE = BAS_ZONE.ZONE 

resources/views/order/index/index.blade.php

@@ -102,7 +102,7 @@
                         if (res.data.success) {
                             if (res.data.data.length>0) {
                                 this.models.unshift.apply(this.models,res.data.data);
-                                if (this.models.length>50) this.models.split(50);
+                                if (this.models.length>50) this.models = this.models.split(50);
                             }
                             this.errors = res.data.errors;
                             tempTip.cancelWaitingTip();

resources/views/waybill/index.blade.php

@@ -461,22 +461,31 @@
                     waybill.btn_refresh_weight='zoomOut'
                 },
                 lazy(){
-                    //可视区域高度
-                    let height=window.innerHeight;
-                    //滚动区域高度
-                    let scrollHeight = document.documentElement.scrollTop || document.body.scrollTop;
-                    let _this=this;
-                    this.imgs.forEach(function (img,i) {
-                        if ((height+scrollHeight)>$('#'+img.getAttribute('id')).offset().top && img.getAttribute('data-src')){
-                            let temp=new Image();
-                            temp.src=img.getAttribute('data-src');
-                            temp.onload=function () {
-                                img.src=img.getAttribute('data-src');
-                                _this.$delete(_this.imgs,i);
+                    //高度
+                    let h=(window.innerWidth)+(document.documentElement.scrollTop || document.body.scrollTop);
+                    this.imgs.forEach((img,i)=>{
+                        let src = img.getAttribute('data-src');
+                        if ((h>this.getElementToPageTop(img)) && src){
+                            let t = new Image();
+                            t.src = src;
+                            if (t.complete) {
+                                img.src = src;
+                                this.$delete(this.imgs,i);
+                                return;
                             }
+                            t.onload = ()=>{
+                                img.src = src;
+                                this.$delete(this.imgs,i);
+                            };
                         }
                     });
                 },
+                getElementToPageTop(el) {
+                    if(el.parentElement) {
+                        return this.getElementToPageTop(el.parentElement) + el.offsetTop
+                    }
+                    return el.offsetTop
+                },
                 waybillAudit(id,waybill_number){
                     if(!confirm('确定要通过“'+waybill_number+'”的审核吗？')){return};
                     let _this=this;