|
|
@@ -61,6 +61,8 @@ class Reorder extends Base
|
|
|
// if($supplier==false){
|
|
|
// return error_show(1005,"未找到商品供应商数据");
|
|
|
// }
|
|
|
+ $names = $userCommon->handle('getCodeAndName',['code'=>[$order['supplierNo'],$order['customer_code']]]);
|
|
|
+
|
|
|
$errorCode = isset($this->post['errorCode']) &&$this->post['errorCode']!=''?trim($this->post['errorCode']) :"";
|
|
|
if($errorCode==''){
|
|
|
return error_show(1004,"参数errorCode 不能为空");
|
|
|
@@ -112,7 +114,13 @@ class Reorder extends Base
|
|
|
"status"=>$order['is_stock']==1?4:1,
|
|
|
"is_del"=>0,
|
|
|
"addtime"=>date("Y-m-d H:i:s"),
|
|
|
- "updatetime"=>date("Y-m-d H:i:s")
|
|
|
+ "updatetime"=>date("Y-m-d H:i:s"),
|
|
|
+ 'supplierNo' => $goon['supplierNo'],
|
|
|
+ 'supplierName' => $supplier['name'],
|
|
|
+ 'companyNo' => $order['supplierNo'],
|
|
|
+ 'companyName' => $names['data'][$order['supplierNo']] ?? '',
|
|
|
+ 'customer_code' => $order['customer_code'],
|
|
|
+ 'customer_name' => $names['data'][$order['customer_code']] ?? '',
|
|
|
];
|
|
|
$create = Db::name("sale_return")->insert($in,true);
|
|
|
if($create>0){
|
|
|
@@ -451,15 +459,16 @@ class Reorder extends Base
|
|
|
}
|
|
|
|
|
|
$relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] != "" ? trim($this->post['relaComNo']) : "";
|
|
|
- if ($relaComNo != "") $where[] = ['b.supplierNo', '=', $relaComNo];
|
|
|
+ if ($relaComNo != "") $where[] = ['sr.companyNo', '=', $relaComNo];
|
|
|
|
|
|
$supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] != "" ? trim($this->post['supplierNo']) : "";
|
|
|
- if ($supplierNo !== "") {
|
|
|
- $spuCode = Db::name('good_basic')
|
|
|
- ->where(['is_del' => 0, 'supplierNo' => $supplierNo])
|
|
|
- ->column('spuCode');
|
|
|
- $where[] = ['b.good_code', "in", $spuCode];
|
|
|
- }
|
|
|
+ if ($supplierNo !== "") $where[] = ['sr.supplierNo', "like", '%' . $supplierNo . '%'];
|
|
|
+
|
|
|
+ $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] != "" ? trim($this->post['companyNo']) : "";
|
|
|
+ if ($companyNo !== "") $where[] = ['sr.companyNo', "like", '%' . $companyNo . '%'];
|
|
|
+
|
|
|
+ $customer_code = isset($this->post['customer_code']) && $this->post['customer_code'] != "" ? trim($this->post['customer_code']) : "";
|
|
|
+ if ($customer_code !== "") $where[] = ['sr.customer_code', "like", '%' . $customer_code . '%'];
|
|
|
|
|
|
$order_source = $order_source = isset($this->post['order_source']) && $this->post['order_source'] != "" ? trim($this->post['order_source']) : "";
|
|
|
if ($order_source !== "") $where[] = ['b.order_source', "=", $order_source];
|
|
|
@@ -497,8 +506,8 @@ class Reorder extends Base
|
|
|
$company_name = isset($this->post['company_name']) && $this->post['company_name'] !== "" ? trim($this->post['company_name']) : "";
|
|
|
if ($company_name !== "") $where[] = ["sr.apply_id", 'in', get_company_item_user_by_name($company_name)];
|
|
|
|
|
|
- $customer_code = trim($this->post['customer_code']??'');
|
|
|
- $where[]=['b.customer_code', "like", "%{$customer_code}%"];
|
|
|
+// $customer_code = trim($this->post['customer_code']??'');
|
|
|
+// $where[]=['b.customer_code', "like", "%{$customer_code}%"];
|
|
|
|
|
|
$count=Db::name("sale_return")
|
|
|
->alias('sr')
|
|
|
@@ -510,7 +519,7 @@ class Reorder extends Base
|
|
|
$page = $total>=$page ? $page :$total;
|
|
|
$list = Db::name("sale_return")
|
|
|
->alias('sr')
|
|
|
- ->field('sr.*,b.skuCode,b.sale_price,b.good_num total_num,b.customer_code,b.supplierNo ,b.order_source')
|
|
|
+ ->field('sr.*,b.skuCode,b.sale_price,b.good_num total_num,b.order_source')
|
|
|
->leftJoin("sale b", "b.orderCode=sr.orderCode AND b.is_del=0")
|
|
|
->where($where)
|
|
|
->where(function ($query)use ($condition){$query->whereOr($condition);})
|
|
|
@@ -522,8 +531,8 @@ class Reorder extends Base
|
|
|
|
|
|
$all_createrid = array_column($list,'apply_id');
|
|
|
$item = get_company_name_by_uid($all_createrid);
|
|
|
- $userCommon = new \app\admin\common\User();
|
|
|
- $names = $userCommon->handle('getCodeAndName',['code'=>array_merge(array_column($list,'supplierNo'),array_column($list,'customer_code'))]);
|
|
|
+// $userCommon = new \app\admin\common\User();
|
|
|
+// $names = $userCommon->handle('getCodeAndName',['code'=>array_merge(array_column($list,'supplierNo'),array_column($list,'customer_code'))]);
|
|
|
|
|
|
$data=[];
|
|
|
foreach ($list as $value){
|
|
|
@@ -537,8 +546,8 @@ class Reorder extends Base
|
|
|
$value['return_total'] =$value['sale_price']*$value['num'] ;
|
|
|
// $value['total_num'] =$order['good_num'] ;
|
|
|
$value['company_name'] = $item[$value['apply_id']]??'';
|
|
|
- $value['supplierName'] = $names['data'][$value['supplierNo']] ?? '';//isset($wsm['company']) ? $wsm['company'] : "";
|
|
|
- $value['customerName'] = $names['data'][$value['customer_code']] ?? '';//isset($wsm['company']) ? $wsm['company'] : "";
|
|
|
+// $value['supplierName'] = $names['data'][$value['supplierNo']] ?? '';//isset($wsm['company']) ? $wsm['company'] : "";
|
|
|
+// $value['customerName'] = $names['data'][$value['customer_code']] ?? '';//isset($wsm['company']) ? $wsm['company'] : "";
|
|
|
//是否具有编辑权限
|
|
|
// $value['is_allow_update'] = 0;
|
|
|
// if (in_array($this->roleid, [1, 33]) || in_array($value['apply_id'], $role[DataGroupModel::$type_可编辑])) $value['is_allow_update'] = 1;
|
|
|
@@ -583,7 +592,7 @@ class Reorder extends Base
|
|
|
$info['send_status'] = isset($orderinfo['send_status'])?$orderinfo['send_status']:'';
|
|
|
$info['total_price'] = isset($orderinfo['total_price'])?$orderinfo['total_price']:'0';
|
|
|
$info['post_fee'] = isset($orderinfo['post_fee'])?$orderinfo['post_fee']:'0';
|
|
|
- $info['customer_code'] = isset($orderinfo['customer_code'])?$orderinfo['customer_code']:'';
|
|
|
+// $info['customer_code'] = isset($orderinfo['customer_code'])?$orderinfo['customer_code']:'';
|
|
|
|
|
|
$userCommon = new \app\admin\common\User();
|
|
|
if($info['return_wsm']!=""){
|
|
|
@@ -593,33 +602,36 @@ class Reorder extends Base
|
|
|
->where(["a.wsm_code"=>$info['return_wsm']])
|
|
|
->field("a.name as wsm_name,a.supplierNo")
|
|
|
->find();
|
|
|
+ $tmp = $userCommon->handle('getCodeAndName', ['code' => [
|
|
|
+// $orderinfo['supplierNo'],
|
|
|
+// $orderinfo['customer_code'],
|
|
|
+ $wsmcode['supplierNo']??'',
|
|
|
+ ]]);
|
|
|
$info['wsm_name'] =isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name']:"";
|
|
|
- }
|
|
|
-
|
|
|
- $tmp = $userCommon->handle('getCodeAndName', ['code' => [
|
|
|
- $orderinfo['supplierNo'],
|
|
|
- $orderinfo['customer_code'],
|
|
|
- $wsmcode['supplierNo']??'',
|
|
|
- ]]);
|
|
|
-
|
|
|
- if(!empty($wsmcode['supplierNo'])){
|
|
|
$info['wsm_supplier'] =$tmp['data'][$wsmcode['supplierNo']]??'';//isset($wsmcode['name']) ? $wsmcode['name']:"";
|
|
|
$info['wsm_supplierNo'] =$wsmcode['supplierNo']??'';//isset($wsmcode['code']) ? $wsmcode['code']:"";
|
|
|
}
|
|
|
|
|
|
- $info['customer_name']='';
|
|
|
- if(isset($orderinfo['customer_code'])&&$orderinfo['customer_code']!=''){
|
|
|
-// $customerinfo = Db::name("customer_info")->where(['companyNo'=>$orderinfo['customer_code']])->find();
|
|
|
- $info['customer_name'] = $tmp['data'][$orderinfo['customer_code']]??'';//isset($customerinfo['companyName']) ? $customerinfo['companyName']:"";
|
|
|
- }
|
|
|
- $info['supplierNo'] = isset($orderinfo['supplierNo'])?$orderinfo['supplierNo']:'';
|
|
|
- $info['supplier_name']='';
|
|
|
- if(isset($orderinfo['supplierNo'])&&$orderinfo['supplierNo']!=''){
|
|
|
-// $customerinfo = Db::name("business")->where(['companyNo'=>$orderinfo['supplierNo']])->find();
|
|
|
-// $info['supplier_name'] = isset($customerinfo['company']) ? $customerinfo['company']:"";
|
|
|
- $info['supplier_name'] = $tmp['data'][$orderinfo['supplierNo']] ?? '';
|
|
|
|
|
|
- }
|
|
|
+
|
|
|
+// if(!empty($wsmcode['supplierNo'])){
|
|
|
+// $info['wsm_supplier'] =$tmp['data'][$wsmcode['supplierNo']]??'';//isset($wsmcode['name']) ? $wsmcode['name']:"";
|
|
|
+// $info['wsm_supplierNo'] =$wsmcode['supplierNo']??'';//isset($wsmcode['code']) ? $wsmcode['code']:"";
|
|
|
+// }
|
|
|
+
|
|
|
+// $info['customer_name']='';
|
|
|
+// if(isset($orderinfo['customer_code'])&&$orderinfo['customer_code']!=''){
|
|
|
+// $customerinfo = Db::name("customer_info")->where(['companyNo'=>$orderinfo['customer_code']])->find();
|
|
|
+// $info['customer_name'] = $tmp['data'][$orderinfo['customer_code']]??'';//isset($customerinfo['companyName']) ? $customerinfo['companyName']:"";
|
|
|
+// }
|
|
|
+// $info['supplierNo'] = isset($orderinfo['supplierNo'])?$orderinfo['supplierNo']:'';
|
|
|
+// $info['supplier_name']='';
|
|
|
+// if(isset($orderinfo['supplierNo'])&&$orderinfo['supplierNo']!=''){
|
|
|
+//// $customerinfo = Db::name("business")->where(['companyNo'=>$orderinfo['supplierNo']])->find();
|
|
|
+//// $info['supplier_name'] = isset($customerinfo['company']) ? $customerinfo['company']:"";
|
|
|
+// $info['supplier_name'] = $tmp['data'][$orderinfo['supplierNo']] ?? '';
|
|
|
+//
|
|
|
+// }
|
|
|
$info['platform_name']='';
|
|
|
$info['platform_id']=$orderinfo['platform_id'];
|
|
|
if($orderinfo['platform_id']!=0){
|
|
|
@@ -642,6 +654,14 @@ class Reorder extends Base
|
|
|
}
|
|
|
|
|
|
$wsm_return = Db::name("sale_returninfo")->where(["returnCode"=>$info["returnCode"],"is_del"=>0])->select()->toArray();
|
|
|
+
|
|
|
+ $all_wsm_code = array_column($wsm_return, 'wsm_code');
|
|
|
+ $all_wsmcode_info = Db::name("warehouse_info")
|
|
|
+ ->where(["wsm_code" => $all_wsm_code])
|
|
|
+ ->column("name,supplierNo", 'wsm_code');
|
|
|
+
|
|
|
+ if (!isset($userCommon)) $userCommon = new \app\admin\common\User();
|
|
|
+ $all_supplier_name = $userCommon->handle('getCodeAndName', ['code' => array_unique(array_column($all_wsmcode_info, 'supplierNo'))]);
|
|
|
$wsm=[];
|
|
|
if(!empty($wsm_return)){
|
|
|
|
|
|
@@ -650,15 +670,15 @@ class Reorder extends Base
|
|
|
$value['wsm_supplier']="";
|
|
|
$value['wsm_supplierNo']="";
|
|
|
if($value['wsm_code']!=""){
|
|
|
- $wsmcode = Db::name("warehouse_info")
|
|
|
- ->alias("a")
|
|
|
- ->leftJoin("supplier b","a.supplierNo=b.code")
|
|
|
- ->where(["a.wsm_code"=>$value['wsm_code']])
|
|
|
- ->field("a.name as wsm_name,b.name,b.code")
|
|
|
- ->find();
|
|
|
- $value['wsm_name'] =isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name']:"";
|
|
|
- $value['wsm_supplier'] =isset($wsmcode['name']) ? $wsmcode['name']:"";
|
|
|
- $value['wsm_supplierNo'] =isset($wsmcode['code']) ? $wsmcode['code']:"";
|
|
|
+// $wsmcode = Db::name("warehouse_info")
|
|
|
+// ->alias("a")
|
|
|
+//// ->leftJoin("supplier b","a.supplierNo=b.code")
|
|
|
+// ->where(["a.wsm_code"=>$value['wsm_code']])
|
|
|
+// ->field("a.name as wsm_name,b.name,b.code")
|
|
|
+// ->find();
|
|
|
+ $value['wsm_name'] = $all_wsmcode_info[$value['wsm_code']]['name'] ?? '';//isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name']:"";
|
|
|
+ $value['wsm_supplier'] = $all_wsmcode_info[$value['wsm_code']]['supplierNo'] ?? '';//isset($wsmcode['name']) ? $wsmcode['name']:"";
|
|
|
+ $value['wsm_supplierNo'] = $all_supplier_name[$all_wsmcode_info[$value['wsm_code']]['supplierNo'] ?? ''] ?? '';//isset($wsmcode['code']) ? $wsmcode['code']:"";
|
|
|
}
|
|
|
$orderwsm = Db::name("sale_info")->where(["orderCode"=>$info["orderCode"],"wsm_code"=>$value["wsm_code"]])->find();
|
|
|
$value["wsm_total"] = isset($orderwsm["num"]) ? $orderwsm["num"]:0;
|
|
|
@@ -679,6 +699,7 @@ class Reorder extends Base
|
|
|
$addrinfo=[];
|
|
|
if(!empty($addr)){
|
|
|
|
|
|
+ if(!isset($userCommon)) $userCommon=new \app\admin\common\User();
|
|
|
$customer_name = $userCommon->handle('getCodeAndName',['code'=>array_column($addr,'customer_code')]);
|
|
|
|
|
|
foreach ( $addr as $value){
|
|
|
@@ -712,8 +733,7 @@ class Reorder extends Base
|
|
|
* @throws \think\db\exception\ModelNotFoundException
|
|
|
*/
|
|
|
public function delete(){
|
|
|
- $code = isset($this->post['returnCode']) && $this->post['returnCode'] !=="" ? trim($this->post['returnCode'])
|
|
|
- :"";
|
|
|
+ $code = isset($this->post['returnCode']) && $this->post['returnCode'] !=="" ? trim($this->post['returnCode']) :"";
|
|
|
if($code==""){
|
|
|
return error_show(1004,"参数returnCode不能为空");
|
|
|
}
|
|
|
@@ -1322,6 +1342,15 @@ class Reorder extends Base
|
|
|
if($order['wsend_num']<$num){
|
|
|
return error_show(1002,"仓库未发货数量不足退货");
|
|
|
}
|
|
|
+
|
|
|
+ if($order['order_type']==3) $goon = Db::name("good_zixun")->field('supplierNo')->where(["spuCode"=>$order['good_code'],"is_del"=>0])->findOrEmpty();
|
|
|
+ else $goon = Db::name('good_basic')
|
|
|
+ ->where(['spuCode' => $order['good_code']])->findOrEmpty();
|
|
|
+ if(empty($goon)) return json_show(1004,'该商品不存在');
|
|
|
+
|
|
|
+ $userCommon = new \app\admin\common\User();
|
|
|
+ $names = $userCommon->handle('getCodeAndName',['code'=>[$order['supplierNo'],$order['customer_code'],$goon['supplierNo']]]);
|
|
|
+
|
|
|
$returnCode=makeNo("RS");
|
|
|
Db::startTrans();
|
|
|
try{
|
|
|
@@ -1339,7 +1368,13 @@ class Reorder extends Base
|
|
|
"status"=>0,
|
|
|
"is_del"=>0,
|
|
|
"addtime"=>date("Y-m-d H:i:s"),
|
|
|
- "updatetime"=>date("Y-m-d H:i:s")
|
|
|
+ "updatetime"=>date("Y-m-d H:i:s"),
|
|
|
+ 'supplierNo' => $goon['supplierNo'],
|
|
|
+ 'supplierName' => $names['data'][$goon['supplierNo']] ?? '',
|
|
|
+ 'companyNo' => $order['supplierNo'],
|
|
|
+ 'companyName' => $names['data'][$order['supplierNo']] ?? '',
|
|
|
+ 'customer_code' => $order['customer_code'],
|
|
|
+ 'customer_name' => $names['data'][$order['customer_code']] ?? '',
|
|
|
];
|
|
|
$create = Db::name("sale_return")->insert($in,true);
|
|
|
if($create>0) {
|
|
|
@@ -1456,6 +1491,11 @@ class Reorder extends Base
|
|
|
if($order['is_stock']==0&&$cgd['send_status']!=1){
|
|
|
return error_show(1005, '采购单已发起入库');
|
|
|
}
|
|
|
+
|
|
|
+ $userCommon = new \app\admin\common\User();
|
|
|
+ $names = $userCommon->handle('getCodeAndName',['code'=>[$order['supplierNo'],$order['customer_code']]]);
|
|
|
+
|
|
|
+
|
|
|
$returnCode=makeNo("RN");
|
|
|
Db::startTrans();
|
|
|
try{
|
|
|
@@ -1482,7 +1522,13 @@ class Reorder extends Base
|
|
|
"is_del"=>0,
|
|
|
"is_all"=>1,
|
|
|
"addtime"=>date("Y-m-d H:i:s"),
|
|
|
- "updatetime"=>date("Y-m-d H:i:s")
|
|
|
+ "updatetime"=>date("Y-m-d H:i:s"),
|
|
|
+ 'supplierNo' => $supplier['code'],
|
|
|
+ 'supplierName' => $supplier['name'],
|
|
|
+ 'companyNo' => $order['supplierNo'],
|
|
|
+ 'companyName' => $names['data'][$order['supplierNo']] ?? '',
|
|
|
+ 'customer_code' => $order['customer_code'],
|
|
|
+ 'customer_name' => $names['data'][$order['customer_code']] ?? '',
|
|
|
];
|
|
|
$create = Db::name("sale_return")->insert($in,true);
|
|
|
if($create>0){
|
|
|
@@ -1722,8 +1768,11 @@ class Reorder extends Base
|
|
|
'good_code'=>'',
|
|
|
'skuCode'=>'',
|
|
|
'relaComNo'=>'',
|
|
|
- 'supplierNo'=>'',
|
|
|
- 'company_name'=>'',
|
|
|
+ 'order_source' => '',
|
|
|
+ 'supplierNo' => '',
|
|
|
+ 'customer_code' => '',
|
|
|
+ 'companyNo' => '',
|
|
|
+ 'company_name' => '',//部门名称
|
|
|
],'post','trim');
|
|
|
$where = [['sr.is_del', "=", 0]];
|
|
|
if (!empty($param['returnCode'])) $where[] = ['sr.returnCode', "in", $param['returnCode']];
|
|
|
@@ -1734,9 +1783,12 @@ class Reorder extends Base
|
|
|
if ($param['end'] !== "") $where[] = ['sr.addtime', "<=", $param['end'] . ' 23:59:59'];
|
|
|
if ($param['good_code'] != "") $where[] = ['sr.good_code', "like", "%{$param['good_code']}%"]; //商品成本编码搜索
|
|
|
if ($param['skuCode'] != "") $where[] = ['b.skuCode', "like", "%{$param['skuCode']}%"];//商品上线编码搜索
|
|
|
- if ($param['relaComNo'] != "") $where[] = ['b.supplierNo', '=', $param['relaComNo']];
|
|
|
- if ($param['supplierNo'] != "") $where[] = ['b.supplierNo', '=', $param['supplierNo']];
|
|
|
+ if ($param['relaComNo'] != "") $where[] = ['a.supplierNo', '=', $param['relaComNo']];
|
|
|
if ($param['company_name'] !== "") $where[] = ["sr.apply_id", 'in', get_company_item_user_by_name($param['company_name'])];
|
|
|
+ if ($param['order_source'] !== "") $where[] = ["b.order_source", '=', $param['order_source']];
|
|
|
+ if ($param['supplierNo'] != "") $where[] = ['a.supplierNo', 'like', '%' . $param['supplierNo'] . '%'];
|
|
|
+ if ($param['customer_code'] != "") $where[] = ['a.customer_code', "like", '%' . $param['customer_code'] . '%'];//商品上线编码搜索
|
|
|
+ if ($param['companyNo'] != "") $where[] = ['a.companyNo', "like", '%' . $param['companyNo'] . '%'];//商品上线编码搜索
|
|
|
|
|
|
$condition = [];
|
|
|
|
