|
@@ -156,6 +156,11 @@ class Sale extends Base
|
|
|
} else {
|
|
|
$sale_price = 0;
|
|
|
}
|
|
|
+ $supplier_info = Db::name('supplier')
|
|
|
+ ->field('id,person,personid')
|
|
|
+ ->where('code',$ct['supplierNo'])
|
|
|
+ ->findOrEmpty();
|
|
|
+
|
|
|
$cgd = [
|
|
|
"supplierNo" => $ct['supplierNo'],
|
|
|
"companyNo" => $supplierNo,
|
|
@@ -181,8 +186,9 @@ class Sale extends Base
|
|
|
"order_source" => 1,//1直接下单
|
|
|
"createrid" => $ct['createrid'],
|
|
|
"creater" => $ct['creater'],
|
|
|
- 'send_way' => 2
|
|
|
-
|
|
|
+ 'send_way' => 2,
|
|
|
+ 'good_createrid' => $goodinfo['createrid'],
|
|
|
+ 'good_creater' => $goodinfo['creater'],//商品创建人
|
|
|
];
|
|
|
$addrlist = isset($this->post['addrlist']) && $this->post['addrlist'] !== "" ? $this->post['addrlist'] : "";
|
|
|
$send_num = 0;
|
|
@@ -246,7 +252,11 @@ class Sale extends Base
|
|
|
"addtime" => date("Y-m-d H:i:s"),
|
|
|
"updatetime" => date("Y-m-d H:i:s"),
|
|
|
'total_price' => round($sale_price * $good_num, 2),
|
|
|
- 'proof_id' => $proof_id
|
|
|
+ 'proof_id' => $proof_id,
|
|
|
+ 'cgderid' => $supplier_info['personid'],
|
|
|
+ 'cgder' => $supplier_info['person'],//采购员(供应商负责人)
|
|
|
+ 'good_createrid' => $goodinfo['createrid'],
|
|
|
+ 'good_creater' => $goodinfo['creater'],//商品创建人
|
|
|
];
|
|
|
$paytime == "" ? "" : $data['paytime'] = $paytime;
|
|
|
$datainfo = Db::name('sale')->insert($data, true);
|
|
@@ -534,7 +544,9 @@ class Sale extends Base
|
|
|
"order_source" => $data['order_source'],
|
|
|
"good_type" => $data['good_type'],
|
|
|
"addtime" => date("Y-m-d H:i:s"),
|
|
|
- "updatetime" => date("Y-m-d H:i:s")
|
|
|
+ "updatetime" => date("Y-m-d H:i:s"),
|
|
|
+ 'good_createrid' => $data['good_createrid'],
|
|
|
+ 'good_creater' => $data['good_creater'],//商品创建人
|
|
|
];
|
|
|
$up = Db::name("purchease_order")->insert($cg, true);
|
|
|
if ($up) {
|
|
@@ -899,7 +911,9 @@ class Sale extends Base
|
|
|
"is_diff" => $zxinfo['is_diff'],
|
|
|
"order_type" => 3,
|
|
|
"order_source" => 2,//咨询
|
|
|
- 'send_way' => $zxinfo['send_way']
|
|
|
+ 'send_way' => $zxinfo['send_way'],
|
|
|
+ 'good_createrid' => $zxinfo['createrid'],
|
|
|
+ 'good_creater' => $zxinfo['creater'],//商品创建人id
|
|
|
];
|
|
|
$token = isset($this->post['token']) && $this->post['token'] != "" ? trim($this->post['token']) : "";
|
|
|
if ($token == "") {
|
|
@@ -949,6 +963,11 @@ class Sale extends Base
|
|
|
return error_show(1003, "咨询单更新业务公司失败");
|
|
|
}
|
|
|
}
|
|
|
+ $supplier_temp_info=Db::name("supplier")
|
|
|
+ ->field('id,person,personid')
|
|
|
+ ->where(["code"=>$zxinfo['supplierNo']])
|
|
|
+ ->findOrEmpty();
|
|
|
+
|
|
|
$data = [
|
|
|
"orderCode" => $orderCode,
|
|
|
"good_code" => $spuCode,
|
|
@@ -990,6 +1009,10 @@ class Sale extends Base
|
|
|
"updatetime" => date("Y-m-d H:i:s"),
|
|
|
'total_price' => round($sale_price * $good_num, 2),
|
|
|
'workNo' => $workNo,
|
|
|
+ 'cgderid' => $supplier_temp_info['personid'],
|
|
|
+ 'cgder' => $supplier_temp_info['person'],//采购员(采购单对应的供应商负责人)
|
|
|
+ 'good_createrid' => $zxinfo['createrid'],
|
|
|
+ 'good_creater' => $zxinfo['creater'],//商品创建人id
|
|
|
];
|
|
|
$datainfo = Db::name('sale')->insert($data, true);
|
|
|
if ($datainfo > 0) {
|
|
@@ -1457,8 +1480,14 @@ class Sale extends Base
|
|
|
"order_type" => 3,//3咨询商品
|
|
|
"order_source" => 3,//项目
|
|
|
"send_way" => $goodinfo['send_way'],
|
|
|
-
|
|
|
+ 'good_createrid' => $goodinfo['createrid'],
|
|
|
+ 'good_creater' => $goodinfo['creater'],//商品创建人
|
|
|
];
|
|
|
+ $supplier_temp_info = Db::name('supplier')
|
|
|
+ ->field('id,person,personid')
|
|
|
+ ->where('code',$goodinfo['supplierNo'])
|
|
|
+ ->findOrEmpty();
|
|
|
+
|
|
|
$datas = [
|
|
|
"orderCode" => $orderCode,
|
|
|
"good_code" => $data['spuCode'],
|
|
@@ -1498,6 +1527,10 @@ 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'],//采购员(供应商负责人)
|
|
|
+ 'good_createrid' => $goodinfo['createrid'],
|
|
|
+ 'good_creater' => $goodinfo['creater'],//商品创建人
|
|
|
];
|
|
|
$datainfo = Db::name('sale')->insert($datas, true);
|
|
|
if ($datainfo > 0) {
|
|
@@ -1707,8 +1740,7 @@ class Sale extends Base
|
|
|
if ($good == false) {
|
|
|
return 4; //商品信息未找到
|
|
|
}
|
|
|
- $goodlass = Db::name("good_ladder")->where(["skuCode" => $data['skuCode'], "is_del" => 0, "status" => 1])->where([["min_num",
|
|
|
- "<=", $data['good_num']]])->order("min_num desc")->find();
|
|
|
+ $goodlass = Db::name("good_ladder")->where(["skuCode" => $data['skuCode'], "is_del" => 0, "status" => 1])->where([["min_num", "<=", $data['good_num']]])->order("min_num desc")->find();
|
|
|
if ($goodlass == false) {
|
|
|
return 4;//商品信息未找到
|
|
|
}
|
|
@@ -1735,6 +1767,13 @@ class Sale extends Base
|
|
|
}
|
|
|
|
|
|
$orderCode = makeNo("QR");
|
|
|
+
|
|
|
+
|
|
|
+ $supplier_temp_info = Db::name('supplier')
|
|
|
+ ->field('id,person,personid')
|
|
|
+ ->where('code',$good['supplierNo'])
|
|
|
+ ->findOrEmpty();
|
|
|
+
|
|
|
$datas = [
|
|
|
"orderCode" => $orderCode,
|
|
|
"good_code" => $data['spuCode'],
|
|
@@ -1774,6 +1813,10 @@ class Sale extends Base
|
|
|
"addtime" => date("Y-m-d H:i:s"),
|
|
|
"updatetime" => date("Y-m-d H:i:s"),
|
|
|
'total_price' => round($sale_price * $data['good_num'], 2),
|
|
|
+ 'cgderid' => $supplier_temp_info['personid'],
|
|
|
+ 'cgder' => $supplier_temp_info['person'],//采购员(供应商负责人)
|
|
|
+ 'good_createrid' => $good['createrid'],
|
|
|
+ 'good_creater' => $good['creater'],//商品创建人
|
|
|
];
|
|
|
$datainfo = Db::name('sale')->insert($datas, true);
|
|
|
if ($datainfo > 0) {
|
|
@@ -1818,7 +1861,9 @@ class Sale extends Base
|
|
|
"creater" => $good['creater'],
|
|
|
"order_type" => $good['is_stock'] == 1 ? 1 : 2,
|
|
|
'order_source' => 3,//3项目
|
|
|
- 'send_way' => 2
|
|
|
+ 'send_way' => 2,
|
|
|
+ 'good_createrid' => $good['createrid'],
|
|
|
+ 'good_creater' => $good['creater'],//商品创建人
|
|
|
];
|
|
|
if ($good['is_stock'] == 0) {
|
|
|
$bol = $this->createCgd($cgd, $standing_book_data);
|
|
@@ -1979,13 +2024,11 @@ class Sale extends Base
|
|
|
if ($orderCode !== "") {
|
|
|
$where[] = ['s.orderCode', "like", "%$orderCode%"];
|
|
|
}
|
|
|
- $apply_name = isset($this->post['apply_name']) && $this->post['apply_name'] !== "" ? trim($this->post['apply_name'])
|
|
|
- : "";
|
|
|
+ $apply_name = isset($this->post['apply_name']) && $this->post['apply_name'] !== "" ? trim($this->post['apply_name']) : "";
|
|
|
if ($apply_name !== "") {
|
|
|
$where[] = ['s.apply_name', "like", "%$apply_name%"];
|
|
|
}
|
|
|
- $good_name = isset($this->post['good_name']) && $this->post['good_name'] !== "" ? trim($this->post['good_name'])
|
|
|
- : "";
|
|
|
+ $good_name = isset($this->post['good_name']) && $this->post['good_name'] !== "" ? trim($this->post['good_name']) : "";
|
|
|
if ($good_name !== "") {
|
|
|
$where[] = ['s.good_name', "like", "%$good_name%"];
|
|
|
}
|
|
@@ -2001,8 +2044,7 @@ class Sale extends Base
|
|
|
if ($supplierNo !== "") {
|
|
|
$where[] = ['s.supplierNo', "like", "%$supplierNo%"];
|
|
|
}
|
|
|
- $ordertype = isset($this->post['order_type']) && $this->post['order_type'] !== "" ? intval($this->post['order_type'])
|
|
|
- : "";
|
|
|
+ $ordertype = isset($this->post['order_type']) && $this->post['order_type'] !== "" ? intval($this->post['order_type']) : "";
|
|
|
if ($ordertype !== "") {
|
|
|
$where[] = ['s.order_type', "=", $ordertype];
|
|
|
}
|
|
@@ -3745,8 +3787,7 @@ class Sale extends Base
|
|
|
|
|
|
public function RelaCgd($outinfo, array &$standing_book_da = [])
|
|
|
{
|
|
|
- $cgd = Db::name("order_bk")->where([["spuCode", "=", $outinfo['spuCode']], ["is_del", "=", 0], ["balance_num", ">=",
|
|
|
- $outinfo['good_num']], ['companyNo', "=", $outinfo['companyNo']]])->lock(true)->find();
|
|
|
+ $cgd = Db::name("order_bk")->where([["spuCode", "=", $outinfo['spuCode']], ["is_del", "=", 0], ["balance_num", ">=", $outinfo['good_num']], ['companyNo', "=", $outinfo['companyNo']]])->lock(true)->find();
|
|
|
if ($cgd == false) {
|
|
|
return false;
|
|
|
}
|
|
@@ -3796,7 +3837,9 @@ class Sale extends Base
|
|
|
"order_source" => $outinfo['order_source'],
|
|
|
"good_type" => $cgdinfo['good_type'],
|
|
|
"addtime" => date("Y-m-d H:i:s"),
|
|
|
- "updatetime" => date("Y-m-d H:i:s")
|
|
|
+ "updatetime" => date("Y-m-d H:i:s"),
|
|
|
+ 'good_createrid' => $good['createrid'],
|
|
|
+ 'good_creater' => $good['creater'],//商品创建人
|
|
|
];
|
|
|
$insetrCgd = Db::name("purchease_order")->insert($QrdCgd);
|
|
|
if ($insetrCgd == false) {
|