From a695d479340e44187ff89bdfd1a3e1c9ae7d7765 Mon Sep 17 00:00:00 2001 From: lewis <604446095@qq.com> Date: Thu, 26 Dec 2024 11:42:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/lists/beforehand_order/BeforehandOrderLists.php | 2 ++ .../purchase_product_offer/PurchaseProductOfferLists.php | 1 - .../purchase_product_offer/PurchaseProductOfferLogic.php | 7 ++++--- app/admin/logic/store_product/StoreProductLogic.php | 4 ++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/admin/lists/beforehand_order/BeforehandOrderLists.php b/app/admin/lists/beforehand_order/BeforehandOrderLists.php index d4a90faa..113d9ace 100644 --- a/app/admin/lists/beforehand_order/BeforehandOrderLists.php +++ b/app/admin/lists/beforehand_order/BeforehandOrderLists.php @@ -112,6 +112,8 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte $item->order_type_name = '往期补单'; } elseif ($item->order_type == 7) { $item->order_type_name = '采购订单'; + } elseif ($item->order_type == 8) { + $item->order_type_name = '其他订单'; } $item->msg = ''; $count1 = PurchaseProductOffer::where('order_id', $item->id)->where('buyer_confirm', 0)->count('id'); diff --git a/app/admin/lists/purchase_product_offer/PurchaseProductOfferLists.php b/app/admin/lists/purchase_product_offer/PurchaseProductOfferLists.php index 5d72a652..1d02eb60 100644 --- a/app/admin/lists/purchase_product_offer/PurchaseProductOfferLists.php +++ b/app/admin/lists/purchase_product_offer/PurchaseProductOfferLists.php @@ -72,7 +72,6 @@ class PurchaseProductOfferLists extends BaseAdminDataLists implements ListsSearc $item->order_sn=BeforehandOrder::where('id',$item['order_id'])->value('order_id'); $find=StoreProduct::where('id',$item->product_id)->withTrashed()->find(); $item->store_name=$find->store_name; - $item->store_info=$find->store_info; $item->image=$find->image; $item->unit_name=StoreProductUnit::where('id',$item->unit)->value('name'); $item->cate_name=StoreCategory::where('id',$find->cate_id)->value('name'); diff --git a/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php b/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php index 7ba297bd..a54b7d3d 100644 --- a/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php +++ b/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php @@ -62,9 +62,6 @@ class PurchaseProductOfferLogic extends BaseLogic } $find=StoreProduct::where('id',$params['product_id'])->find(); $purchaseProductOffer = PurchaseProductOffer::where(['order_id' => $procurementOrder['id'], 'product_id' => $params['product_id']])->find(); - $procurementOrder->total_price = bcadd($procurementOrder->total_price, bcmul($find['price'], $params['need_num'], 2), 2); - $procurementOrder->pay_price = $procurementOrder->total_price; - $procurementOrder->save(); if ($purchaseProductOffer) { $purchaseProductOffer->need_num = $purchaseProductOffer['need_num'] + $params['need_num']; if (!empty($purchaseProductOffer['source_order_info'])) { @@ -184,6 +181,10 @@ class PurchaseProductOfferLogic extends BaseLogic // $find = StoreProductPrice::where(['offer_id' => $params['id']])->find(); $product = StoreProduct::where('id', $offer['product_id'])->withTrashed()->field('id,store_name,top_cate_id,two_cate_id')->find(); $unit_name=StoreProductUnit::where('id', $offer['unit'])->value('name'); + $order = BeforehandOrder::where('id', $params['bhoid'])->find(); + $order->pay_price = bcadd($offer['total_price'], $order->pay_price, 2); + $order->total_price = $order->pay_price; + $order->save(); self::setProductGroupPrice($params, $product); // $data = []; // $dict_data = DictData::where('type_value', 'price_lv_' . $product['top_cate_id'])->field('name,value')->select(); diff --git a/app/admin/logic/store_product/StoreProductLogic.php b/app/admin/logic/store_product/StoreProductLogic.php index c16f39bc..924a5e01 100644 --- a/app/admin/logic/store_product/StoreProductLogic.php +++ b/app/admin/logic/store_product/StoreProductLogic.php @@ -73,6 +73,8 @@ class StoreProductLogic extends BaseLogic 'store_batch' => $params['store_batch'] ?? 1, 'product_type' => $params['product_type'] ?? 0, 'is_show' => $params['is_show'] ?? 0, + 'made_place' => $params['made_place'] ?? '', + 'shelf_life' => $params['shelf_life'] ?? 0, ]; $rose = 0; //零售-供货 @@ -222,6 +224,8 @@ class StoreProductLogic extends BaseLogic 'manufacturer_information' => $params['manufacturer_information'] ?? '', 'swap' => $params['swap'] ?? 0, 'is_show' => $params['is_show'] ?? 0, + 'made_place' => $params['made_place'] ?? '', + 'shelf_life' => $params['shelf_life'] ?? 0, ]; $rose = 0; //零售-供货 From 0e2b83587b693624c8b1129a1e63279f1ae0884b Mon Sep 17 00:00:00 2001 From: lewis <604446095@qq.com> Date: Thu, 26 Dec 2024 17:04:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=95=86=E5=93=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=9F=E4=BA=A7=E6=97=A5=E6=9C=9F=E3=80=81?= =?UTF-8?q?=E4=BF=9D=E8=B4=A8=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseProductOfferLists.php | 6 ++++ .../BeforehandOrderCartInfoLogic.php | 2 ++ .../PurchaseProductOfferLogic.php | 4 +++ .../logic/store_product/StoreProductLogic.php | 2 -- .../WarehouseProductLogic.php | 33 +++++++++---------- 5 files changed, 28 insertions(+), 19 deletions(-) diff --git a/app/admin/lists/purchase_product_offer/PurchaseProductOfferLists.php b/app/admin/lists/purchase_product_offer/PurchaseProductOfferLists.php index 1d02eb60..51529640 100644 --- a/app/admin/lists/purchase_product_offer/PurchaseProductOfferLists.php +++ b/app/admin/lists/purchase_product_offer/PurchaseProductOfferLists.php @@ -71,6 +71,12 @@ class PurchaseProductOfferLists extends BaseAdminDataLists implements ListsSearc ->select()->each(function($item) use($job_ids){ $item->order_sn=BeforehandOrder::where('id',$item['order_id'])->value('order_id'); $find=StoreProduct::where('id',$item->product_id)->withTrashed()->find(); + $item->store_info = empty($item['store_info']) ? ($find['store_info'] ?? '') : $item['store_info']; + $item->after_sales = empty($item['after_sales']) ? ($find['after_sales'] ?? '') : $item['after_sales']; + $item->marques = empty($item['marques']) ? ($find['marques'] ?? '') : $item['marques']; + $item->package = empty($item['package']) ? ($find['package'] ?? '') : $item['package']; + $item->expiration_date = $item->expiration_date ? date('Y-m-d', $item->expiration_date) : ''; + $item->manufacture = $item->manufacture ? date('Y-m-d', $item->manufacture) : ''; $item->store_name=$find->store_name; $item->image=$find->image; $item->unit_name=StoreProductUnit::where('id',$item->unit)->value('name'); diff --git a/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php b/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php index 6381f808..25f59a5d 100644 --- a/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php +++ b/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php @@ -235,6 +235,8 @@ class BeforehandOrderCartInfoLogic extends BaseLogic $data['purchase'] = $v['price']; $data['total_price'] = $v['total_price']; $data['financial_pm'] = 1; + $data['manufacture'] = $v['manufacture'] > 0 ? date('Y-m-d H:i:s', $v['manufacture']) : ''; + $data['expiration_date'] = $v['expiration_date'] > 0 ? date('Y-m-d H:i:s', $v['expiration_date']) : ''; $product_arr=[]; if($v['package']!=''){ $product_arr['package']=$v['package']; diff --git a/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php b/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php index a54b7d3d..74cce148 100644 --- a/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php +++ b/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php @@ -156,6 +156,8 @@ class PurchaseProductOfferLogic extends BaseLogic */ public static function setProcureInfo(array $params): bool { + $params['manufacture'] = !empty($params['manufacture']) ? strtotime($params['manufacture']) : ''; + $params['expiration_date'] = !empty($params['expiration_date']) ? strtotime($params['expiration_date']) : ''; $offer = PurchaseProductOffer::where(['id' => $params['id']])->find(); // $uid=Admin::where('id',$params['admin_id'])->value('uid'); // if($params['admin_id']!=1){ @@ -177,6 +179,8 @@ class PurchaseProductOfferLogic extends BaseLogic 'store_info' => $params['store_info'], 'marques' => $params['marques'], 'after_sales' => $params['after_sales'], + 'manufacture' => $params['manufacture'], + 'expiration_date' => $params['expiration_date'], ]); // $find = StoreProductPrice::where(['offer_id' => $params['id']])->find(); $product = StoreProduct::where('id', $offer['product_id'])->withTrashed()->field('id,store_name,top_cate_id,two_cate_id')->find(); diff --git a/app/admin/logic/store_product/StoreProductLogic.php b/app/admin/logic/store_product/StoreProductLogic.php index 924a5e01..fcf2663d 100644 --- a/app/admin/logic/store_product/StoreProductLogic.php +++ b/app/admin/logic/store_product/StoreProductLogic.php @@ -74,7 +74,6 @@ class StoreProductLogic extends BaseLogic 'product_type' => $params['product_type'] ?? 0, 'is_show' => $params['is_show'] ?? 0, 'made_place' => $params['made_place'] ?? '', - 'shelf_life' => $params['shelf_life'] ?? 0, ]; $rose = 0; //零售-供货 @@ -225,7 +224,6 @@ class StoreProductLogic extends BaseLogic 'swap' => $params['swap'] ?? 0, 'is_show' => $params['is_show'] ?? 0, 'made_place' => $params['made_place'] ?? '', - 'shelf_life' => $params['shelf_life'] ?? 0, ]; $rose = 0; //零售-供货 diff --git a/app/admin/logic/warehouse_product/WarehouseProductLogic.php b/app/admin/logic/warehouse_product/WarehouseProductLogic.php index a7b3b257..1a1962d6 100644 --- a/app/admin/logic/warehouse_product/WarehouseProductLogic.php +++ b/app/admin/logic/warehouse_product/WarehouseProductLogic.php @@ -193,7 +193,6 @@ class WarehouseProductLogic extends BaseLogic */ public static function edit(array $params) { - Db::startTrans(); try { $before_nums = 0; @@ -221,24 +220,24 @@ class WarehouseProductLogic extends BaseLogic $before_nums = $warehouseProductStorege['nums']; $after_nums = bcsub($warehouseProductStorege['nums'], $params['nums'], 2); } + $datas = [ + 'nums' => $params['nums'], + 'before_nums' => $before_nums, + 'after_nums' => $after_nums, + 'total_price' => $params['total_price'], + ]; if($find['financial_pm']==1){ - $datas=[ - 'nums' => $params['nums'], - 'supplier_id' => $params['supplier_id'], - 'pay_type' => $params['pay_type'], - 'purchase' => $params['purchase'], - 'before_nums' => $before_nums, - 'after_nums' => $after_nums, - 'total_price' => $params['total_price'], - ]; + $datas['supplier_id'] = $params['supplier_id']; + $datas['pay_type'] = $params['pay_type']; + $datas['purchase'] = $params['purchase']; }else{ - $datas=[ - 'nums' => $params['nums'], - 'price' => $params['price'], - 'before_nums' => $before_nums, - 'after_nums' => $after_nums, - 'total_price' => $params['total_price'], - ]; + $datas['price'] = $params['price']; + } + if (isset($params['manufacture']) && $params['manufacture'] != '') { + $datas['manufacture'] = strtotime($params['manufacture']); + } + if (isset($params['expiration_date']) && $params['expiration_date'] != '') { + $datas['expiration_date'] = strtotime($params['expiration_date']); } WarehouseProduct::where('id', $params['id'])->update($datas); $finds = WarehouseProduct::where('oid', $params['oid'])->field('sum(nums) as nums,sum(total_price) as total_price')->find();