From 0670282c738e8e0da26748955060899f79985880 Mon Sep 17 00:00:00 2001
From: lccsw <1127794702@qq.com>
Date: Fri, 24 Dec 2021 16:49:11 +0800
Subject: [PATCH] add-admin-item_company_id
---
admin/controllers/items/goods/Goods.php | 8 +++++++-
admin/controllers/receiver/Orders.php | 14 ++++++++++++++
admin/views/items/goods/edit.php | 12 ++++++++++++
admin/views/receiver/orders/get.php | 3 +++
sql/item.sql | 1 +
5 files changed, 37 insertions(+), 1 deletion(-)
diff --git a/admin/controllers/items/goods/Goods.php b/admin/controllers/items/goods/Goods.php
index 2e49f5fa..b512497d 100644
--- a/admin/controllers/items/goods/Goods.php
+++ b/admin/controllers/items/goods/Goods.php
@@ -21,6 +21,7 @@ class Goods extends HD_Controller
$this->load->model("biz/biz_model", 'mdBiz');
$this->load->model("sys/sys_addr_model", 'addr_model');
$this->load->model('area_model', 'mdArea');
+ $this->load->model('sys/sys_company_model');
}
public function index()
@@ -444,10 +445,11 @@ class Goods extends HD_Controller
{
$autoList = array();
$id = intval($this->input->get('id'));
- $info['brand_id'] = $info['s_id'] = $info['v_id'] = $info['cor_id'] = $info['incor_id'] = 0;
+ $info['company_id'] = $info['brand_id'] = $info['s_id'] = $info['v_id'] = $info['cor_id'] = $info['incor_id'] = 0;
$info['if_pack'] = $info['city_id'] = $info['county_id'] = $info['biz_id'] = $info['addr_id'] = '';
$info['status'] = 1;
$autoList[2] = $autoList[3] = $autoList[4] = $autoList[5] = array();
+ $comList = $this->sys_company_model->select(['status'=>1],'','','','id,short');
if ($id > 0) {
$re = $this->mdItems->get(array('id' => $id));
if (!$re || empty($re)) {
@@ -496,6 +498,7 @@ class Goods extends HD_Controller
}
$autoList[1] = $this->mdAutoBrand->select(array('status' => 1), 'id desc', 0, 0, 'id,name');
$showInfo['autoList'] = $autoList;
+ $showInfo['comList'] = $comList;
$showInfo['statusAry'] = $this->statusAry;
$this->data['info'] = $info;
$this->data['showInfo'] = $showInfo;
@@ -612,6 +615,7 @@ class Goods extends HD_Controller
$addData['incor_id'] = $info['incor_id'];
$addData['if_pack'] = $info['if_pack'];
$addData['status'] = $info['status'];
+ $addData['company_id'] = $info['company_id'];
$addData['address'] = $info['address'] ? $info['address'] : '';
$addData['vin'] = $info['vin'] ? $info['vin'] : '';
@@ -773,6 +777,8 @@ class Goods extends HD_Controller
$editData['in_time'] = $info['in_time'];
$editData['out_time'] = $info['out_time'];
$editData['bill_time'] = $info['bill_time'];
+
+ $editData['company_id'] = $info['company_id'];
//存货地址
$biz_id = $addr_id = 0;
if ($info['biz_id']) {
diff --git a/admin/controllers/receiver/Orders.php b/admin/controllers/receiver/Orders.php
index 7544e53c..029c7be0 100644
--- a/admin/controllers/receiver/Orders.php
+++ b/admin/controllers/receiver/Orders.php
@@ -198,6 +198,20 @@ class Orders extends HD_Controller
$bill['cardidB'] = $bill['cardidB'] ? array('value' => $bill['cardidB'], 'src' => build_qiniu_image_url($bill['cardidB'])) : array('value' => '', 'src' => '');
$bill['business_licence'] = $bill['business_licence'] ? array('value' => $bill['business_licence'], 'src' => build_qiniu_image_url($bill['business_licence'])) : array('value' => '', 'src' => '');
$bill['status'] = intval($bill['status']);
+ $row_goods['company_id'] && $item_company = $this->sys_company_model->get(['id'=>$row_goods['company_id']],'id,short');
+ if(!$item_company){
+ $item_html = '车辆归属未选择';
+ }else{
+ $item_html = "车辆公司归属【{$item_company['short']}】";
+ }
+ $pay_order = $this->app_liche_orders_model->get(['type'=>3,'status'=>1,'o_id'=>$row['id']],'mch_id');
+ $pay_order && $pay_compay = $this->sys_company_model->get(['wx_mchid' => $pay_order['mch_id']],'id,short');
+ $pay_html = '';
+ if($pay_compay){
+ $ck_html = $pay_compay['id'] == $item_company['id'] ? '一致' : '不一致';
+ $pay_html = "与尾款收款公司【{$pay_compay['short']}】 {$ck_html}";
+ }
+ $bill['warning'] = $item_html. $pay_html;
$row['bill'] = $bill;
//获取合同文件
$contracts = $this->order_contracts_model->select(['o_id' => $row['id'], 'status' => 1], '', '', '', 'type,file,status');
diff --git a/admin/views/items/goods/edit.php b/admin/views/items/goods/edit.php
index 649b2975..85e09b1a 100644
--- a/admin/views/items/goods/edit.php
+++ b/admin/views/items/goods/edit.php
@@ -66,6 +66,17 @@
+ |
+
+ |
|
@@ -224,6 +235,7 @@
+
|