|
|
@@ -166,13 +166,19 @@ class Sale extends Base
|
|
|
} else {
|
|
|
$sale_price = 0;
|
|
|
}
|
|
|
- $supplier_info = Db::name('supplier')
|
|
|
- ->field('id,person,personid')
|
|
|
- ->where('code',$ct['supplierNo'])
|
|
|
- ->findOrEmpty();
|
|
|
-
|
|
|
+// $supplier_info = Db::name('supplier')
|
|
|
+// ->field('id,person,personid')
|
|
|
+// ->where('code',$ct['supplierNo'])
|
|
|
+// ->findOrEmpty();
|
|
|
+ $userCommon= new \app\admin\common\User();
|
|
|
+ $supplier_temp =$userCommon->handle("sInfo",["code"=>$ct['supplierNo']]);
|
|
|
+ if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1002,"采购单供应商不存在");
|
|
|
+ $holder_id=$supplier_temp['data']['personid']??0;
|
|
|
+ $holder_name=$supplier_temp['data']['person']??'';
|
|
|
+ $supplier_name=$supplier_temp['data']['name']??'';
|
|
|
$cgd = [
|
|
|
"supplierNo" => $ct['supplierNo'],
|
|
|
+ "supplierName" => $supplier_name,
|
|
|
"companyNo" => $supplierNo,
|
|
|
"orderCode" => $orderCode,
|
|
|
"spuCode" => $ct['spuCode'],
|
|
|
@@ -194,8 +200,8 @@ class Sale extends Base
|
|
|
"gold_price" => isset($ct['cgd_gold_price']) ? $ct['cgd_gold_price'] : 0,
|
|
|
"order_type" => $is_stock == 1 ? 1 : 2,
|
|
|
"order_source" => 1,//1直接下单
|
|
|
- "createrid" =>$supplier_info['personid'],
|
|
|
- "creater" =>$supplier_info['person'],
|
|
|
+ "createrid" =>$holder_id,
|
|
|
+ "creater" =>$holder_name,
|
|
|
'send_way' => 2,
|
|
|
'good_createrid' => $goodinfo['createrid'],
|
|
|
'good_creater' => $goodinfo['creater'],//商品创建人
|
|
|
@@ -258,8 +264,8 @@ class Sale extends Base
|
|
|
"updatetime" => date("Y-m-d H:i:s"),
|
|
|
'total_price' => round($sale_price * $good_num, 2),
|
|
|
'proof_id' => $proof_id,
|
|
|
- 'cgderid' => $supplier_info['personid'],
|
|
|
- 'cgder' => $supplier_info['person'],//采购员(供应商负责人)
|
|
|
+ 'cgderid' => $holder_id,
|
|
|
+ 'cgder' => $holder_name,//采购员(供应商负责人)
|
|
|
'good_createrid' => $goodinfo['createrid'],
|
|
|
'good_creater' => $goodinfo['creater'],//商品创建人
|
|
|
];
|
|
|
@@ -419,18 +425,18 @@ class Sale extends Base
|
|
|
//节点1待库管发货
|
|
|
if($data['is_stock']==0){
|
|
|
//非库存品，推给供应商负责人
|
|
|
- $supp = Db::name('supplier')
|
|
|
- ->field('person,personid')
|
|
|
- ->where('code',$ct['supplierNo'])
|
|
|
- ->findOrEmpty();
|
|
|
+// $supp = Db::name('supplier')
|
|
|
+// ->field('person,personid')
|
|
|
+// ->where('code',$ct['supplierNo'])
|
|
|
+// ->findOrEmpty();
|
|
|
ProcessOrder::AddProcess(['id'=>$rm,'nickname'=>$ri], [
|
|
|
"order_type" => 'CKD',
|
|
|
"order_code" => $outCode,//出库单号
|
|
|
"order_id" => $ou,
|
|
|
"order_status" => $out['status'],
|
|
|
"before_status" => $out['status'],
|
|
|
- 'wait_id'=>$supp['personid'],
|
|
|
- 'wait_name'=>$supp['person'],
|
|
|
+ 'wait_id'=>$holder_id,
|
|
|
+ 'wait_name'=>$holder_name,
|
|
|
]);
|
|
|
}else{
|
|
|
//库存品,推给31库管和41库管-张凯旋
|
|
|
@@ -488,22 +494,22 @@ class Sale extends Base
|
|
|
public function createCgd($data, array &$standing_book_da = [])
|
|
|
{
|
|
|
$cgdCode = makeNo("CG");
|
|
|
- $supplier = Db::name("supplier")->where(["code" => $data['supplierNo'], "is_del" => 0])->find();
|
|
|
- if ($supplier == false) {
|
|
|
- return false;
|
|
|
- }
|
|
|
+// $supplier = Db::name("supplier")->where(["code" => $data['supplierNo'], "is_del" => 0])->find();
|
|
|
+// if ($supplier == false) {
|
|
|
+// return false;
|
|
|
+// }
|
|
|
$wsm = Db::name("warehouse_info")->where(["supplierNo" => $data["supplierNo"], "companyNo" => $data['companyNo'], "wsm_type" => 2, "is_del" => 0])->find();
|
|
|
if ($wsm == false) {
|
|
|
$wsm_code = makeNo("WSM");
|
|
|
$inwsm = [
|
|
|
"wsm_code" => $wsm_code,
|
|
|
- "name" => $supplier['name'],
|
|
|
+ "name" => $data['supplierName'],
|
|
|
"wsm_type" => 2,
|
|
|
- "supplierNo" => $supplier['code'],
|
|
|
+ "supplierNo" => $data['supplierNo'],
|
|
|
"addr" => "",
|
|
|
"addrs_code" => "",
|
|
|
- "contactor" => $data['order_type'] == 1 ? $supplier['personid'] : $data['createrid'],
|
|
|
- "contactor_name" => $data['order_type'] == 1 ? $supplier['person'] : $data['creater'],
|
|
|
+ "contactor" => $data['createrid'] ,
|
|
|
+ "contactor_name" => $data['creater'] ,
|
|
|
"mobile" => "",
|
|
|
"position" => "",
|
|
|
"companyNo" => $data['companyNo'],
|
|
|
@@ -547,7 +553,7 @@ class Sale extends Base
|
|
|
"diff_weight" => "0",
|
|
|
"diff_fee" => "0",
|
|
|
"supplierNo" => $data['supplierNo'],
|
|
|
- "supplier_name" => $supplier['name'],
|
|
|
+ "supplier_name" => $data['supplierName'],
|
|
|
"companyNo" => $data['companyNo'],
|
|
|
"send_status" => 1,
|
|
|
"send_num" => 0,
|
|
|
@@ -582,9 +588,9 @@ class Sale extends Base
|
|
|
"order_id" => $up,
|
|
|
"order_status" => $cg['status'],
|
|
|
"before_status" => 0,
|
|
|
- 'holder_id' => $supplier['personid'],
|
|
|
- 'wait_id'=>$supplier['personid'],
|
|
|
- 'wait_name'=>$supplier['person'],
|
|
|
+ 'holder_id' => $data['createrid'],
|
|
|
+ 'wait_id'=>$data['createrid'],
|
|
|
+ 'wait_name'=>$data['creater'],
|
|
|
]);
|
|
|
|
|
|
$standing_book_da = array_merge($standing_book_da, [
|
|
|
@@ -670,6 +676,7 @@ class Sale extends Base
|
|
|
if ($addrlist == "" || empty($addrlist) || !is_array($addrlist)) {
|
|
|
return error_show(1004, "参数addrlist不能为空");
|
|
|
}
|
|
|
+ $userCommon= new \app\admin\common\User();
|
|
|
Db::startTrans();
|
|
|
try {
|
|
|
|
|
|
@@ -860,19 +867,25 @@ class Sale extends Base
|
|
|
];
|
|
|
}else{
|
|
|
//推给供应商负责人
|
|
|
- $supplier = Db::name('supplier')
|
|
|
- ->field('person,personid')
|
|
|
- ->where('code',$cgdinfo['supplierNo'])
|
|
|
- ->findOrEmpty();
|
|
|
+// $supplier = Db::name('supplier')
|
|
|
+// ->field('person,personid')
|
|
|
+// ->where('code',$cgdinfo['supplierNo'])
|
|
|
+// ->findOrEmpty();
|
|
|
+
|
|
|
+ $supplier_temp =$userCommon->handle("sInfo",["code"=>$cgdinfo['supplierNo']]);
|
|
|
+ if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1002,"采购单供应商不存在");
|
|
|
+ $holder_id=$supplier_temp['data']['personid']??0;
|
|
|
+ $holder_name=$supplier_temp['data']['person']??'';
|
|
|
+ $supplier_name=$supplier_temp['data']['name']??'';
|
|
|
$process = [
|
|
|
"order_type" => 'CKD',
|
|
|
"order_code" => $outCode,//出库单号
|
|
|
"order_id" => $ou,
|
|
|
"order_status" => $status,
|
|
|
"before_status" => 0,
|
|
|
- 'wait_id'=>$supplier['personid'],
|
|
|
- 'wait_name'=>$supplier['person'],
|
|
|
- 'holder_id'=>$supplier['personid'],
|
|
|
+ 'wait_id'=>$holder_id,
|
|
|
+ 'wait_name'=>$holder_name,
|
|
|
+ 'holder_id'=>$holder_id,
|
|
|
];
|
|
|
}
|
|
|
}
|
|
|
@@ -1553,12 +1566,20 @@ class Sale extends Base
|
|
|
return false;
|
|
|
}
|
|
|
$orderCode = makeNo("QR");
|
|
|
- $supplier_temp_info = Db::name('supplier')
|
|
|
- ->field('id,person,personid')
|
|
|
- ->where('code',$goodinfo['supplierNo'])
|
|
|
- ->findOrEmpty();
|
|
|
+// $supplier_temp_info = Db::name('supplier')
|
|
|
+// ->field('id,person,personid')
|
|
|
+// ->where('code',$goodinfo['supplierNo'])
|
|
|
+// ->findOrEmpty();
|
|
|
+ $userCommon= new \app\admin\common\User();
|
|
|
+ $supplier_temp =$userCommon->handle("sInfo",["code"=>$goodinfo['supplierNo']]);
|
|
|
+ if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1002,"采购单供应商不存在");
|
|
|
+ $holder_id=$supplier_temp['data']['personid']??0;
|
|
|
+ $holder_name=$supplier_temp['data']['person']??'';
|
|
|
+ $supplierName=$supplier_temp['data']['name']??'';
|
|
|
+
|
|
|
$cgd = [
|
|
|
"supplierNo" => $goodinfo['supplierNo'],
|
|
|
+ "supplierName" => $supplierName,
|
|
|
"companyNo" => $data['companyNo'],
|
|
|
"spuCode" => $data['spuCode'],
|
|
|
"skuCode" => "",
|
|
|
@@ -1575,8 +1596,8 @@ class Sale extends Base
|
|
|
"nake_fee" => $goodinfo['nake_fee'],
|
|
|
"good_num" => $data['good_num'],
|
|
|
"delivery_fee" => $goodinfo['delivery_fee'],
|
|
|
- "createrid" =>$supplier_temp_info['personid'],
|
|
|
- "creater" =>$supplier_temp_info['person'],
|
|
|
+ "createrid" =>$holder_id,
|
|
|
+ "creater" =>$holder_name,
|
|
|
"weight" => $goodinfo['good_weight'],
|
|
|
"gold_price" => $goodinfo['gold_price'],
|
|
|
"good_type" => 1,
|
|
|
@@ -1625,8 +1646,8 @@ class Sale extends Base
|
|
|
"addtime" => date("Y-m-d H:i:s"),
|
|
|
"updatetime" => date("Y-m-d H:i:s"),
|
|
|
'total_price' => round($data['sale_price'] * $data['good_num'], 2),
|
|
|
- 'cgderid' => $supplier_temp_info['personid'],
|
|
|
- 'cgder' => $supplier_temp_info['person'],//采购员(供应商负责人)
|
|
|
+ 'cgderid' => $holder_id,
|
|
|
+ 'cgder' => $holder_name,//采购员(供应商负责人)
|
|
|
'good_createrid' => $goodinfo['createrid'],
|
|
|
'good_creater' => $goodinfo['creater'],//商品创建人
|
|
|
];
|
|
|
@@ -1791,8 +1812,8 @@ class Sale extends Base
|
|
|
"order_status" => 0,
|
|
|
"before_status" => 0,
|
|
|
'holder_id'=>$data['rm'],
|
|
|
- 'wait_id'=>$supplier_temp_info['personid'],
|
|
|
- 'wait_name'=>$supplier_temp_info['person'],
|
|
|
+ 'wait_id'=>$holder_id,
|
|
|
+ 'wait_name'=>$holder_name,
|
|
|
]);
|
|
|
$order['send_num'] += $value['receipt_quantity'];
|
|
|
$order['wsend_num'] -= $value['receipt_quantity'];
|
|
|
@@ -1873,11 +1894,14 @@ class Sale extends Base
|
|
|
$orderCode = makeNo("QR");
|
|
|
|
|
|
|
|
|
- $supplier_temp_info = Db::name('supplier')
|
|
|
- ->field('id,person,personid')
|
|
|
- ->where('code',$good['supplierNo'])
|
|
|
- ->findOrEmpty();
|
|
|
-
|
|
|
+// $supplier_temp_info = Db::name('supplier')
|
|
|
+// ->field('id,person,personid')
|
|
|
+// ->where('code',$good['supplierNo'])
|
|
|
+// ->findOrEmpty();
|
|
|
+ $userCommon= new \app\admin\common\User();
|
|
|
+ $supplier_temp =$userCommon->handle("sInfo",["code"=>$good['supplierNo']]);
|
|
|
+ if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1002,"供应商不存在");
|
|
|
+ $supplier_temp_info = $supplier_temp['data'];
|
|
|
$datas = [
|
|
|
"orderCode" => $orderCode,
|
|
|
"good_code" => $data['spuCode'],
|
|
|
@@ -1944,6 +1968,7 @@ class Sale extends Base
|
|
|
]);
|
|
|
$cgd = [
|
|
|
"supplierNo" => $good['supplierNo'],
|
|
|
+ "supplierName" => $supplier_temp_info['name'],
|
|
|
"companyNo" => $data['companyNo'],
|
|
|
"orderCode" => $orderCode,
|
|
|
"spuCode" => $good['spuCode'],
|
|
|
@@ -2328,10 +2353,10 @@ class Sale extends Base
|
|
|
if ($supplierNo == "") {
|
|
|
return error_show(1002, "参数supplierNo不能为空");
|
|
|
}
|
|
|
- $supplier = Db::name("supplier")->where(["code" => $supplierNo])->find();
|
|
|
- if ($supplier == false) {
|
|
|
- return error_show(1004, "未找到平台供应商数据");
|
|
|
- }
|
|
|
+// $supplier = Db::name("supplier")->where(["code" => $supplierNo])->find();
|
|
|
+// if ($supplier == false) {
|
|
|
+// return error_show(1004, "未找到平台供应商数据");
|
|
|
+// }
|
|
|
$apply_id = GetUserInfo($token);
|
|
|
if (empty($apply_id) || $apply_id['code'] != 0) {
|
|
|
return error_show(1002, "申请人数据不存在");
|
|
|
@@ -3012,7 +3037,7 @@ class Sale extends Base
|
|
|
->column('uid');
|
|
|
$order = ["order_type" => "CKD", "order_code" => $outCode, "order_id" => $datainfo, "order_status" => $data['status'], "before_status" => 0, 'handle_user_list' => implode(',', $uids)];
|
|
|
}else{
|
|
|
- //推给供应商负责人
|
|
|
+ //推给供应商负责人 ###todo::接口废弃
|
|
|
$supplier = Db::name('supplier')
|
|
|
->alias('a')
|
|
|
->field('a.id,a.person,a.personid')
|
|
|
@@ -3093,7 +3118,7 @@ class Sale extends Base
|
|
|
|
|
|
$order = [];
|
|
|
if ($status == 1) {
|
|
|
- //推给供应商负责人
|
|
|
+ //推给供应商负责人#todo::接口废弃
|
|
|
if ($dr['is_stock'] == 0) {
|
|
|
$supplier = Db::name('supplier')
|
|
|
->alias('a')
|
|
|
@@ -3571,8 +3596,8 @@ class Sale extends Base
|
|
|
$condition .= " a.apply_id in (" . implode(',', $arr) . ")";
|
|
|
}
|
|
|
}
|
|
|
- $personid = Db::name('supplier')->field('id')->where(['is_del' => 0, 'personid' => $hand])->findOrEmpty();
|
|
|
- if ($personid) {
|
|
|
+// $personid = Db::name('supplier')->field('id')->where(['is_del' => 0, 'personid' => $hand])->findOrEmpty();
|
|
|
+ if (!empty($hand)) {
|
|
|
if ($condition != '') $condition .= " or ";
|
|
|
$condition .= "(b.is_stock=0 and sip.personid in ($uidarr))";
|
|
|
}
|
|
|
@@ -3604,7 +3629,7 @@ class Sale extends Base
|
|
|
->join("warehouse_info n", "n.wsm_code=a.wsm_code", "left")
|
|
|
->leftJoin("order_send os", "os.outCode=a.outCode")
|
|
|
->leftJoin("purchease_order wpo", "wpo.cgdNo=os.cgdNo")
|
|
|
- ->leftJoin('supplier sip', 'sip.code=wpo.supplierNo')
|
|
|
+// ->leftJoin('supplier sip', 'sip.code=wpo.supplierNo')
|
|
|
->where($where)
|
|
|
->where($condition)
|
|
|
->count();
|
|
|
@@ -3617,8 +3642,8 @@ class Sale extends Base
|
|
|
->join("warehouse_info n", "n.wsm_code=a.wsm_code AND n.is_del=0", "left")
|
|
|
->leftJoin("order_send os", "os.outCode=a.outCode")
|
|
|
->leftJoin("purchease_order wpo", "wpo.cgdNo=os.cgdNo")
|
|
|
- ->leftJoin('supplier sip', 'sip.code=wpo.supplierNo')
|
|
|
- ->field("a.*,b.order_type,b.order_source,b.good_name,b.good_code,b.skuCode,b.supplierNo,b.customer_code,v.companyName,b.origin_price,b.sale_price,b.total_price,os.cgdNo")
|
|
|
+// ->leftJoin('supplier sip', 'sip.code=wpo.supplierNo')
|
|
|
+ ->field("a.*,b.order_type,b.order_source,b.good_name,b.good_code,b.skuCode,b.supplierNo,b.customer_code,n.name as wsm_name,n.supplierNo as wsm_supplierNo,v.companyName,b.origin_price,b.sale_price,b.total_price,os.cgdNo")
|
|
|
->where($where)
|
|
|
->where($condition)
|
|
|
->order("addtime desc")
|
|
|
@@ -3628,17 +3653,22 @@ class Sale extends Base
|
|
|
|
|
|
$all_createrid = array_column($list,'apply_id');
|
|
|
$item = get_company_name_by_uid($all_createrid);
|
|
|
+ $user= new \app\admin\common\User();
|
|
|
+ $supplier =$user->handle("getCodeAndName",["code"=>array_merge(array_column($list,"supplierNo"),array_column($list,"wsm_supplierNo"))]);
|
|
|
|
|
|
$data = [];
|
|
|
foreach ($list as $value) {
|
|
|
|
|
|
if($value['order_type']==1 && $value['wsm_code']==''){
|
|
|
- $wsmcode = Db::name("good")->alias("a")
|
|
|
- ->leftJoin("supplier b","a.supplierNo=b.code")
|
|
|
- ->where(["a.spuCode"=>$value['good_code']])->field("'' wsm_name,b.name,b.code")->find();
|
|
|
+// $wsmcode = Db::name("good")->alias("a")
|
|
|
+// ->leftJoin("supplier b","a.supplierNo=b.code")
|
|
|
+// ->where(["a.spuCode"=>$value['good_code']])->field("'' wsm_name,b.name,b.code")->find();
|
|
|
+ $value['wsm_supplierNo'] =$value['supplierNo'];
|
|
|
+ $value['wsm_supplier'] = $supplier['data'][$value['supplierNo']]??"";
|
|
|
}else{
|
|
|
- $wsmcode = Db::name("warehouse_info")->alias("k")->leftJoin("supplier c", "k.supplierNo=c.code")
|
|
|
- ->where(["k.wsm_code" => $value['wsm_code']])->field("k.name as wsm_name,c.name,c.code")->find();
|
|
|
+// $wsmcode = Db::name("warehouse_info")->alias("k")->leftJoin("supplier c", "k.supplierNo=c.code")
|
|
|
+// ->where(["k.wsm_code" => $value['wsm_code']])->field("k.name as wsm_name,c.name,c.code")->find();
|
|
|
+ $value['wsm_supplier'] = $supplier['data'][$value['wsm_supplierNo']]??"";
|
|
|
}
|
|
|
$addr = Db::name("order_addr")->where(["id" => $value['addrid']])->find();
|
|
|
if($addr){
|
|
|
@@ -3654,10 +3684,7 @@ class Sale extends Base
|
|
|
} else {
|
|
|
$goon = Db::name('good_platform')->field('a.id,b.cat_id')->alias('a')->join('good b', 'b.spuCode=a.spuCode', 'left')->where(['a.skuCode' => $value['skuCode']])->find();
|
|
|
}
|
|
|
- $value['wsm_name'] = isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name'] : "";
|
|
|
- $value['wsm_supplierNo'] = isset($wsmcode['code']) ? $wsmcode['code'] : "";
|
|
|
- $value['wsm_supplier'] = isset($wsmcode['name']) ? $wsmcode['name'] : "";
|
|
|
- $value['wsm_has_account'] = (int)isset(checkHasAccountBySupplierNos([$wsmcode['code']])[$wsmcode['code']]);
|
|
|
+ $value['wsm_has_account'] = (int)isset(checkHasAccountBySupplierNos([$wsmcode['wsm_supplierNo']])[$wsmcode['wsm_supplierNo']]);
|
|
|
$value['addr'] = isset($addr['addr']) ? $addr['addr_cn'].$addr['addr'] : "";
|
|
|
$value['contactor'] = isset($addr['contactor']) ? $addr['contactor'] : "";
|
|
|
$value['mobile'] = isset($addr['mobile']) ? $addr['mobile'] : "";
|
|
|
@@ -3969,11 +3996,17 @@ class Sale extends Base
|
|
|
$process = ["order_type" => 'CKD', "order_code" => $data['outCode'], "order_id" => $datainfo, "order_status" => $data['status'], "before_status" => 0, 'holder_id' => $data['apply_id'], 'handle_user_list' => implode(',', $uids)];
|
|
|
} else{
|
|
|
//推给供应商负责人
|
|
|
- $supplier = Db::name('supplier')
|
|
|
- ->field('person,personid')
|
|
|
- ->where('code', $cgd['supplierNo'])
|
|
|
- ->findOrEmpty();
|
|
|
- $process = ["order_type" => 'CKD', "order_code" => $data['outCode'], "order_id" => $datainfo, "order_status" => $data['status'], "before_status" => 0, 'holder_id' => $data['apply_id'], 'wait_id' => $supplier['personid'], 'wait_name' => $supplier['person'],];
|
|
|
+// $supplier = Db::name('supplier')
|
|
|
+// ->field('person,personid')
|
|
|
+// ->where('code', $cgd['supplierNo'])
|
|
|
+// ->findOrEmpty();
|
|
|
+ $userCommon= new \app\admin\common\User();
|
|
|
+ $supplier_temp =$userCommon->handle("sInfo",["code"=>$cgd['supplierNo']]);
|
|
|
+ if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1002,"采购单供应商不存在");
|
|
|
+ $holder_id=$supplier_temp['data']['personid']??0;
|
|
|
+ $holder_name=$supplier_temp['data']['personid']??0;
|
|
|
+ $process = ["order_type" => 'CKD', "order_code" => $data['outCode'], "order_id" =>
|
|
|
+ $datainfo, "order_status" => $data['status'], "before_status" => 0, 'holder_id' => $data['apply_id'], 'wait_id' => $holder_id, 'wait_name' => $holder_name,];
|
|
|
}
|
|
|
}
|
|
|
if (empty($process)) $process = ["order_type" => 'CKD', "order_code" => $data['outCode'], "order_id" => $datainfo, "order_status" => $data['status'], "before_status" => 0, 'holder_id' => $data['apply_id']];
|
|
|
@@ -4589,8 +4622,12 @@ class Sale extends Base
|
|
|
$price = Db::name("gold_price1")->where(["type" => $order['metal_id'], "status" => 1, "is_del" => 0])->order("addtime desc")->find();
|
|
|
|
|
|
}
|
|
|
- $supplier = Db::name("supplier")->where(["code" => $order['supplierNo']])->find();
|
|
|
- $order['supplier_name'] = isset($supplier['name']) ? $supplier['name'] : "";
|
|
|
+ $userCommon = new \app\admin\common\User();
|
|
|
+ $supplier_temp = $userCommon->handle('getCodeAndName', ['code' => $order['supplierNo']]);
|
|
|
+// $supplier =Db::name("supplier")->where(['code'=>$supplierNo])->find();
|
|
|
+// if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1004,"未找到供应商信息");
|
|
|
+// $supplier = Db::name("supplier")->where(["code" => $order['supplierNo']])->find();
|
|
|
+ $order['supplier_name'] = $supplier_temp['data'][$order['supplierNo']]??"";
|
|
|
// $palt =Db::name("platform")->where(["id"=>$order['platform_id']])->find();
|
|
|
// $order['platform_name']=isset($palt['platform_name']) ? $palt['platform_name']:"";
|
|
|
$order["gold_price"] = isset($price['price']) ? $price['price'] : 0;
|
|
|
@@ -4642,7 +4679,7 @@ class Sale extends Base
|
|
|
->leftJoin("purchease_order po", "po.cgdNo=os.cgdNo AND po.is_del=0")
|
|
|
->select()
|
|
|
->toArray();
|
|
|
-
|
|
|
+ $userCommon = new \app\admin\common\User();
|
|
|
foreach ($list as &$value) {
|
|
|
|
|
|
if ($value['order_type'] == 3) {
|
|
|
@@ -4672,8 +4709,11 @@ class Sale extends Base
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ $supplier_temp = $userCommon->handle('sInfo', ['code' =>$value['供应商编号']]);
|
|
|
+ $supplier=$supplier_temp['data']??[];
|
|
|
$value['供应商编号'] = $good['supplierNo']??"";
|
|
|
- $supplier= Db::name("supplier")->where(["code"=>$value['供应商编号']])->field("name,person")->find();
|
|
|
+// $supplier= Db::name("supplier")->where(["code"=>$value['供应商编号']])->field("name,person")->find();
|
|
|
$value['供应商名称'] = $supplier['name']??"";
|
|
|
$value['采购员'] = $supplier['person']??"";
|
|
|
$good_unit = isset($good['good_unit']) ? $good['good_unit'] : 0;
|
