Merge branch 'Haozi'

app/Console/Commands/AccordingToOwnersManualBack.php

@@ -54,7 +54,6 @@ class AccordingToOwnersManualBack extends Command
         } catch (\Exception $e) {
             app('LogService')->log(__METHOD__, __FUNCTION__, "自动回传失败" . $last_order_manual_back_at . ' || '
                 .$now. ' || ' . json_encode($ownerCodes).' || ' . json_encode($e->getMessage()));
-            dd($e->getMessage());
         }
         $this->setOrderManualBackAt();//回传结束时间标记
     }

app/Http/Controllers/OrderController.php

@@ -368,6 +368,20 @@ sql;
         $orderNos=$request->input('ordernos');
         $failNo=array();
         $successNo=array();
+        $docOrders=OracleDOCOrderHeader::query()
+            ->whereIn('orderno',$orderNos)
+            ->get();
+        /** @var OrderService $service */
+        $service=app("OrderService");
+        foreach ($docOrders as $order){
+            if ($order->sostatus=='00' || $order->sostatus=='10' || $order->sostatus=='20'){
+                $res = $service->allocation($order->orderno,$order->warehouseid);
+                if (mb_substr($res,0,3)!='000') {
+                    array_push($failNo,$order->orderno);
+                    app('LogService')->log(__METHOD__,'手动回传分配失败'.__FUNCTION__,json_encode($order->orderno),Auth::user()['id']);
+                }
+            }
+        }
         foreach ($orderNos as $no){
             $res=$orderService->manualBack($no);
             if (!$res){

app/Services/HandInStorageService.php

@@ -575,6 +575,7 @@ sql;
 
             // 3：flux 创建状态为创建的入库事务
             $actTransactionLog = $this->setFluxActTransactionLog($info, $lotNum, $who, $time,$asnHeader,$asnDetail);
+
             if (count($actTransactionLog) == 0){$db->rollBack();return false;}
 
             // 4：flux 新增一条上架任务记录
@@ -592,6 +593,7 @@ sql;
             return true;
         } catch (\Exception $e) {
             $db->rollBack();
+            app('LogService')->log(__METHOD__,__FUNCTION__,'收货异常'.json_encode($info).'|catch:'.$e->getMessage());
             return false;
         }
 
@@ -777,7 +779,7 @@ sql;
             $actTransactionLog['trackid'], $actTransactionLog['lotNum'], $actTransactionLog['packid'], 'EA', $info['amount'], $info['amount'],
             $info['location'], $info['location'], $actTransactionLog['trackid'], '00', 'Putaway Task', '3', $invlotatt['lotatt01'], $invlotatt['lotatt02'], $invlotatt['lotatt03'], $invlotatt['lotatt04'],
             $invlotatt['lotatt05'], $invlotatt['lotatt06'], $invlotatt['lotatt07'], $invlotatt['lotatt08'], $actTransactionLog['trid'], $who, $time, null, null, null, null,
-            $actTransactionLog['userdefine1'], $actTransactionLog['userdefine2'], $actTransactionLog['userdefine3'], $actTransactionLog['warehouseid']
+            SUBSTR($actTransactionLog['userdefine1'],1,40), $actTransactionLog['userdefine2'], $actTransactionLog['userdefine3'], $actTransactionLog['warehouseid']
         ]);
     }
 

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

@@ -1103,10 +1103,14 @@
                                 if (order.soreference5 //存在快递单号
                                     && order.releasestatus!='H' //订单未冻结
                                     && order.manualflag=='N' //订单未回传
-                                    && (order.sostatus=='40' ||
+                                    && (order.sostatus=='00' ||
+                                        order.sostatus=='10' ||
+                                        order.sostatus=='20' ||
+                                        order.sostatus=='40' ||
                                         order.sostatus=='50' ||
                                         order.sostatus=='60' ||
-                                        order.sostatus=='61')) //订单状态为 分配完成,部分拣货,拣货完成,或播种完成
+                                        order.sostatus=='61')//订单状态为 创建订单,部分预配,预配完成,分配完成,部分拣货,拣货完成,或播种完成
+                                )
                                 {orders.push(order.orderno);}else {fail.push(order.orderno)}
                             }
                         });
@@ -1126,7 +1130,14 @@
                             if (res.data.success) {
                                 _this.orders.forEach(function (order){
                                     res.data.successNo.forEach(function (success_item){
-                                        if (order.orderno==success_item)order.manualflag='Y';
+                                        if (order.orderno==success_item){
+                                            if (order.sostatus=='00'
+                                                ||order.sostatus=='10'
+                                                ||order.sostatus=='20'){
+                                                order.ordercodename='分配完成';
+                                            }
+                                            order.manualflag='Y';
+                                        }
                                     })
                                 })
                                 res.data.failNo.forEach(function (item){

resources/views/store/handInStorage/putaway.blade.php

@@ -330,6 +330,8 @@
                                         return;
                                     }
                                     this.tasks=[];
+                                    this.info.barCode='';
+                                    document.getElementById("barCode").focus();
                                     window.tempTip.setDuration(3000);
                                     window.tempTip.show(res.data.data);
                                     window.tempTip.showErrorAudio();

resources/views/store/handInStorage/receiveDetailPage.blade.php

@@ -208,6 +208,7 @@
                                 this.$forceUpdate()
                             }else {
                                 this.clearInfo();
+                                document.getElementById("sku").focus();
                                 window.tempTip.setDuration(2000);
                                 window.tempTip.show(res.data.data);
                                 window.tempTip.showErrorAudio();