|
@@ -233,6 +233,9 @@ class Product extends Api
|
|
|
if (!empty($value['ms_coe'])){
|
|
if (!empty($value['ms_coe'])){
|
|
|
$data['Gy0_Ms'] = $value['ms_coe'];
|
|
$data['Gy0_Ms'] = $value['ms_coe'];
|
|
|
}
|
|
}
|
|
|
|
|
+ if (!empty($value['workshop'])){
|
|
|
|
|
+ $data['Gy0_site'] = $value['workshop'];
|
|
|
|
|
+ }
|
|
|
$sql = db('产品_工艺资料')->where('UniqID',$value['UniqID'])->fetchSql(true)->update($data);
|
|
$sql = db('产品_工艺资料')->where('UniqID',$value['UniqID'])->fetchSql(true)->update($data);
|
|
|
$res = Db::query($sql);
|
|
$res = Db::query($sql);
|
|
|
if ($res !== false){
|
|
if ($res !== false){
|
|
@@ -647,7 +650,8 @@ class Product extends Api
|
|
|
}
|
|
}
|
|
|
$params = Request::instance()->get();
|
|
$params = Request::instance()->get();
|
|
|
$search = $params['search'];
|
|
$search = $params['search'];
|
|
|
- $num = config('product_code_digit');
|
|
|
|
|
|
|
+// $num = config('product_code_digit');
|
|
|
|
|
+ $num=5;
|
|
|
if (!empty($search)){
|
|
if (!empty($search)){
|
|
|
$sql = "SELECT DISTINCT rtrim(a.`物料代码`) AS `物料代码`,rtrim(a.`物料名称`) AS `物料名称`,rtrim(b.`客户编号`) AS `客户编号`,rtrim(b.`客户名称`) AS `客户名称` FROM
|
|
$sql = "SELECT DISTINCT rtrim(a.`物料代码`) AS `物料代码`,rtrim(a.`物料名称`) AS `物料名称`,rtrim(b.`客户编号`) AS `客户编号`,rtrim(b.`客户名称`) AS `客户名称` FROM
|
|
|
`物料_存货编码` a
|
|
`物料_存货编码` a
|
