Merge branch 'master' into zengjun

app/Http/Controllers/HandInStorageController.php

@@ -213,9 +213,18 @@ class HandInStorageController extends Controller
             }else{
                 Cache::put($key,true, $ttl);
             }
-
             $result = $handInStorageService->fluxHandPa($info, $checkData);
-            if ($result===true)$this->success("上架成功");
+            if ($result===true){
+                if ($checkData['customerid']=="JIANSHANG"){
+                    $asn=OracleDOCASNHeader::query()
+                        ->where('asnno',$checkData['docno'])
+                        ->where('asnstatus','99')
+                        ->whereIn('asntype',['F10','F21','F31','F32'])
+                        ->first();
+                    if ($asn){$handInStorageService->verifyAsnStatusAndInsert($asn);}
+                }
+                $this->success("上架成功");
+            }
             if ($result===false) $this->error("上架失败");
             if ($result===1)$this->error("拣货区找到效期更新的同样货品，不能上架至存储区");
         } catch (\Exception $e) {

app/Jobs/PackageCollectingAllocation.php

@@ -37,23 +37,6 @@ class PackageCollectingAllocation implements ShouldQueue
     {
         /** @var OrderPackageService $orderPackageService */
         $orderPackageService = app('OrderPackageService');
-        DB::beginTransaction();
-        try {
-            $result = OrderPackage::query()->where("id",$this->orderPackage->id)
-                ->where("collecting_status",0)->update(["collecting_status"=>1]);
-            if ($result==1){
-                $result = $orderPackageService->collectUpload([$this->orderPackage->logistic_number]);
-                if (!$result["success"]){
-                    DB::rollBack();
-                    Log::warning("自动揽收失败",["message"=>$result["message"],"param"=>$this->orderPackage->logistic_number]);
-                    return;
-                }
-            }else Log::warning("自动揽收异常",["message"=>"未能成功修改揽收标记","param"=>["id"=>$this->orderPackage->id,
-                "number"=>$this->orderPackage->logistic_number],"line"=>$result]);
-            DB::commit();
-        }catch (\Exception $e){
-            DB::rollBack();
-            Log::warning("自动揽收错误",["param"=>$this->orderPackage->toJson()]);
-        }
+        $orderPackageService->collectUpload([$this->orderPackage->logistic_number]);
     }
 }

app/OrderPackage.php

@@ -216,21 +216,12 @@ class OrderPackage extends Model
     public function fetchAllFromOracle()
     {
         if (empty($this->oracleInfo)) return null;
-        /*        $this->fetchOwnerFromOracle();
-                $this->fetchLogisticFromOracle();*/
-        /*        $this['recipient'] = $this->oracleInfo['consigneename'];
-                $this['order_code'] = $this->oracleInfo['orderno'];*/
         $this['batch_rule'] = $this->oracleInfo['descr'];
-        /*        $this['recipient_mobile'] = $this->oracleInfo['c_tel2']??$this->oracleInfo['c_tel1'];
-                if(!$this['logistic_number']&&$this->oracleInfo['soreference5'])
-                    $this['logistic_number'] = $this->oracleInfo['soreference5'];*/
         $this['batch_number'] = $this->oracleInfo['waveno'] ?? null;
     }
 
     static public function createPackagesFromBatchCode($batchCode, $weight)
     {
-
-
         $queryBuilder = OracleDOCOrderHeader::query()->select(self::$oracleOrderHeaderFields);
         $queryBuilder->where('doc_order_header.waveno', $batchCode);
         $queryBuilder->leftJoin('act_allocation_details', 'act_allocation_details.orderno', 'doc_order_header.orderno');
@@ -281,9 +272,6 @@ class OrderPackage extends Model
         DB::transaction(function () use ($newPackages) {
             OrderPackage::query()->insert($newPackages);
         });
-
-
-        app('LogService')->log(__METHOD__, "批量录入包裹成功", json_encode($packages), Auth::user()['id']);
     }
 
     public function unifyThisMeasureUnderSameBatch()

app/Services/HandInStorageService.php

@@ -469,6 +469,45 @@ sql;
             return true; //上架成功
         });
     }
+
+    /**
+     * ASN关闭后  针对JIANSHANG货主，订单关闭后将数据写入临时表CUS_ADJ_H
+     */
+    public function verifyAsnStatusAndInsert($asn)
+    {
+        $who = 'WAS' . (Auth::user() ? '-' . Auth::user()["name"] : '');
+        $host = config('database.connections.oracle.host');
+        $serviceName = config('database.connections.oracle.service_name');
+        $user = config('database.connections.oracle.username');
+        $password = config('database.connections.oracle.password');
+        $conn = oci_connect($user, $password, $host . '/' . $serviceName, 'utf8');
+        $IN_WarehouseID = '';
+        $IN_Parameter1 = 'ASNCLOSE_AFTER';
+        $IN_Parameter2 = $asn->asnno;
+        $IN_Parameter3 = $asn->asnstatus;
+        $IN_Parameter4 = '';
+        $IN_Language = '';
+        $IN_UserID = $who;
+        $OUT_Return_Code = '';
+        $sql_sp = "begin SPUDF_ProcessA(:IN_WarehouseID,:IN_Parameter1,:IN_Parameter2,:IN_Parameter3,:IN_Parameter4,:IN_Language,:IN_UserID,:OUT_Return_Code); end;";
+        $stmt = oci_parse($conn, $sql_sp);
+        oci_bind_by_name($stmt, ':IN_WarehouseID', $IN_WarehouseID);
+        oci_bind_by_name($stmt, ':IN_Parameter1', $IN_Parameter1);
+        oci_bind_by_name($stmt, ':IN_Parameter2', $IN_Parameter2);
+        oci_bind_by_name($stmt, ':IN_Parameter3', $IN_Parameter3);
+        oci_bind_by_name($stmt, ':IN_Parameter4', $IN_Parameter4);
+        oci_bind_by_name($stmt, ':IN_Language', $IN_Language);
+        oci_bind_by_name($stmt, ':IN_UserID', $IN_UserID);
+        oci_bind_by_name($stmt, ':OUT_Return_Code', $OUT_Return_Code, 300);
+        oci_execute($stmt);
+
+        if (substr($OUT_Return_Code, 0, 3) != '000') {
+            app('LogService')->log(__METHOD__, '上架调用sp生成异动数据失败' . __FUNCTION__, "asn:" . $asn . "ERROR：" . $OUT_Return_Code);
+            return false;
+        }
+        oci_close($conn);
+        return true;
+    }
     /**
      * @param $task
      * @param $location

app/Services/RejectedBillService.php

@@ -354,7 +354,7 @@ class RejectedBillService
         $service = app("OwnerPriceOperationService");
         foreach ($stores as $store){
             $GLOBALS["FEE_INFO"] = [];
-            list($id,$money,$taxFee) = $service->matching($store, Feature::MAPPING["store"], $store->owner_id, "入库",0);
+            list($id,$money,$taxFee) = $service->matching(substr($rejectedBill->updated_at,0,7),$store, Feature::MAPPING["store"], $store->owner_id, "入库",0);
             $bill = OwnerFeeDetail::query()->where("outer_id",$store->id)->where("outer_table_name","stores")->first();
             if ($bill)app("StoreService")->clearFeeInfo($store->asn_code);
             if ($bill) $bill->update([

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

@@ -1624,8 +1624,8 @@
                                 return true;
                             });
                             _this.重排序并显示();
-                            if (response.data.inventoryMission.difference_amount!==0)_this.初盘有盘点差异_确认是否重盘();
-                            if (response.data.inventoryMission.difference_amount===0){
+                            if (response.data.inventoryMission.difference_amount!=0){_this.初盘有盘点差异_确认是否重盘();}
+                            if (response.data.inventoryMission.difference_amount==0){
                                 _this.清空inputs();
                                 tempTip.setDuration(3000);
                                 tempTip.showSuccess('盘点成功！');