\ No newline at end of file
diff --git a/app/Gdoo/Customer/views/widget/customerCount.blade.php b/app/Gdoo/Customer/views/widget/customerCount.blade.php
new file mode 100644
index 00000000..211c6c04
--- /dev/null
+++ b/app/Gdoo/Customer/views/widget/customerCount.blade.php
@@ -0,0 +1,15 @@
+
\ No newline at end of file
diff --git a/app/Gdoo/Produce/Controllers/MaterialController.php b/app/Gdoo/Produce/Controllers/MaterialController.php
index 3fcf3dcd..fc86f183 100644
--- a/app/Gdoo/Produce/Controllers/MaterialController.php
+++ b/app/Gdoo/Produce/Controllers/MaterialController.php
@@ -9,8 +9,6 @@ use Gdoo\Model\Form;
use Gdoo\Model\Grid;
use Gdoo\User\Models\User;
-use Gdoo\Produce\Models\Material;
-use Gdoo\Produce\Models\Formula;
use Gdoo\Produce\Services\ProduceService;
@@ -18,94 +16,7 @@ use Gdoo\Index\Controllers\DefaultController;
class MaterialController extends DefaultController
{
- public $permission = ['dialog', 'config', 'configSave', 'planProduct', 'planTotal'];
-
- public function index()
- {
- $header = Grid::header([
- 'code' => 'product_material',
- 'referer' => 1,
- 'search' => ['by' => ''],
- ]);
-
- $cols = $header['cols'];
-
- $cols['actions']['options'] = [[
- 'name' => '编辑',
- 'action' => 'edit',
- 'display' => $this->access['edit'],
- ]];
-
- $header['buttons'] = [
- ['name' => '删除', 'icon' => 'fa-remove', 'action' => 'delete', 'display' => $this->access['delete']],
- ['name' => '导出', 'icon' => 'fa-share', 'action' => 'export', 'display' => 1],
- ];
- $header['left_buttons'] = [
- ['name' => '配料', 'color' => 'default', 'icon' => 'fa-file-text-o', 'action' => 'config', 'display' => 1],
- ];
-
- $header['cols'] = $cols;
- $header['tabs'] = Material::$tabs;
-
- $search = $header['search_form'];
- $query = $search['query'];
-
- if (Request::method() == 'POST') {
- $model = DB::table($header['table'])->setBy($header);
- foreach ($header['join'] as $join) {
- $model->leftJoin($join[0], $join[1], $join[2], $join[3]);
- }
- $model->orderBy($header['sort'], $header['order']);
-
- foreach ($search['where'] as $where) {
- if ($where['active']) {
- $model->search($where);
- }
- }
-
- $model->select($header['select']);
- $rows = $model->paginate($query['limit'])->appends($query);
- return Grid::dataFilters($rows, $header);
- }
-
- return $this->display([
- 'header' => $header,
- ]);
- }
-
- public function create($action = 'edit')
- {
- $id = (int)Request::get('id');
- $form = Form::make(['code' => 'product_material', 'id' => $id, 'action' => $action]);
- return $this->render([
- 'form' => $form,
- ], 'create');
- }
-
- public function edit()
- {
- return $this->create('edit');
- }
-
- // 配方
- public function config()
- {
- $id = (int)Request::get('id');
- if (Request::method() == 'POST') {
- $rows = DB::table('product_formula')->where('material_id', $id)
- ->leftJoin('product', 'product.id', '=', 'product_formula.product_id')
- ->leftJoin('product_unit', 'product_unit.id', '=', 'product.unit_id')
- ->get([
- 'product.name as product_name',
- 'product.code as product_code',
- 'product.spec as product_spec',
- 'product_unit.name as product_unit',
- 'product_formula.*'
- ]);
- return $this->json($rows, true);
- }
- return $this->display(['id' => $id]);
- }
+ public $permission = ['planProduct', 'planTotal'];
// 用料计划
public function plan()
@@ -184,7 +95,7 @@ class MaterialController extends DefaultController
c.name as product_unit,
a.product_num,
a.material_id,
- d.category as category_name,
+ dc.name as category_name,
d.name as material_name,
a.material_num,
a.total_num
@@ -195,8 +106,9 @@ class MaterialController extends DefaultController
from material_plan_day a
left join product b on a.product_id = b.id
left join product_unit AS c ON b.unit_id = c.id
- left join product_material d on a.Material_Id = d.Id
- where a.date = '".$date."' and a.Dept_Id = $department_id and a.Product_Id = $product_id";
+ left join product d on a.material_id = d.id
+ left join product_category dc on dc.id = d.category_id
+ where a.date = '".$date."' and a.dept_id = $department_id and a.product_id = $product_id";
$rows = DB::select($sql);
}
return $this->json($rows, true);
@@ -222,16 +134,17 @@ class MaterialController extends DefaultController
$sql = "select a.date,
a.dept_id,
a.material_id,
- d.category as category_name,
+ dc.name as category_name,
d.name as material_name,
sum(a.material_num) material_num,
- sum(a.total_num)total_num
+ sum(a.total_num) total_num
from material_plan_day a
left join product b on a.product_id = b.id
left join product_unit AS c ON b.unit_id = c.id
- left join product_material d on a.Material_Id = d.Id
- where a.date = '$date' and a.Dept_Id = ".$department_id."
- group by a.Date, a.Dept_Id, a.Material_Id, d.category, d.Name";
+ left join product d on a.material_id = d.id
+ left join product_category dc on dc.id = d.category_id
+ where a.date = '$date' and a.dept_id = ".$department_id."
+ group by a.date, a.dept_id, a.material_id, dc.name, d.name";
$rows = DB::select($sql);
}
return $this->json($rows, true);
@@ -241,83 +154,4 @@ class MaterialController extends DefaultController
'query' => $query,
]);
}
-
- // 配方保存
- public function configSave()
- {
- $gets = Request::all();
- $id = $gets['id'];
- if (empty($id)) {
- return $this->json('原辅料编号不能为空');
- }
-
- $data = $gets['product_formula'];
-
- // 新增或者修改
- foreach((array)$data['rows'] as $_row) {
- $_row['material_id'] = $id;
- $row = Formula::findOrNew($_row['id']);
- $row->fill($_row)->save();
- }
-
- // 删除记录
- foreach((array)$data['deleteds'] as $row) {
- if ($row['id'] > 0) {
- Formula::where('id', $row['id'])->delete();
- }
- }
- return $this->json('配方保存成功。', true);
- }
-
- public function delete()
- {
- if (Request::method() == 'POST') {
- $ids = Request::get('id');
- return Form::remove(['code' => 'product_material', 'ids' => $ids]);
- }
- }
-
- public function dialog()
- {
- $search = search_form([
- 'advanced' => '',
- 'prefix' => '',
- 'offset' => '',
- 'sort' => '',
- 'order' => '',
- 'limit' => '',
- ], [
- ['text','logistics.name','名称'],
- ]);
- $query = $search['query'];
-
- if (Request::method() == 'POST') {
- $model = DB::table('logistics');
- // 排序方式
- if ($query['sort'] && $query['order']) {
- $model->orderBy('logistics.'.$query['sort'], $query['order']);
- }
-
- foreach ($search['where'] as $where) {
- if ($where['active']) {
- $model->search($where);
- }
- }
-
- $model->selectRaw("logistics.*");
-
- if ($query['limit']) {
- $rows = $model->paginate($query['limit']);
- } else {
- $rows['total'] = $model->count();
- $rows['data'] = $model->get();
- }
- return $rows;
- }
-
- return $this->render([
- 'search' => $search,
- 'query' => $query,
- ]);
- }
}
diff --git a/app/Gdoo/Produce/Controllers/PlanController.php b/app/Gdoo/Produce/Controllers/PlanController.php
index 4e563999..5b7abd20 100644
--- a/app/Gdoo/Produce/Controllers/PlanController.php
+++ b/app/Gdoo/Produce/Controllers/PlanController.php
@@ -10,7 +10,6 @@ use Gdoo\Model\Grid;
use Gdoo\User\Models\User;
use Gdoo\Produce\Models\Plan;
-use Gdoo\Produce\Models\Formula;
use Gdoo\Produce\Services\ProduceService;
diff --git a/app/Gdoo/Produce/Models/Material.php b/app/Gdoo/Produce/Models/Material.php
deleted file mode 100644
index 94189199..00000000
--- a/app/Gdoo/Produce/Models/Material.php
+++ /dev/null
@@ -1,15 +0,0 @@
- 'tab',
- 'items' => [
- ['value' => 'material.index', 'url' => 'produce/material/index', 'name' => '原辅料档案'],
- ]
- ];
-}
diff --git a/app/Gdoo/Produce/Services/ProduceService.php b/app/Gdoo/Produce/Services/ProduceService.php
index 4280f50b..3aff774c 100644
--- a/app/Gdoo/Produce/Services/ProduceService.php
+++ b/app/Gdoo/Produce/Services/ProduceService.php
@@ -25,7 +25,7 @@ class ProduceService
if ($date) {
if ($isCalAgain) {
// 删除先有计划
- DB::delete("delete FROM material_plan_day where date = '$date' and Dept_Id=$department_id");
+ DB::delete("delete FROM material_plan_day where date = '$date' and dept_id = $department_id");
// 获取生产计划
$items = DB::select("
@@ -35,11 +35,11 @@ class ProduceService
c.quantity as material_num,
c.material_id,
d.department_id,
- case when ISNULL(c.ratio, 1) = 0 then 0 else ISNULL(d.plan_num, 0) * ISNULL(c.quantity, 0) / ISNULL(c.ratio, 1) end as total_num
+ ISNULL(d.plan_num, 0) * ISNULL(c.quantity, 0) + (ISNULL(c.quantity, 0) * ISNULL(c.loss_rate, 0)) AS total_num
FROM produce_plan m, produce_plan_data d
left join(
- select a.product_id, a.material_id, a.quantity, b.ratio
- from product_formula a left join product_material b on a.material_id = b.id
+ select product_id, material_id, quantity, loss_rate
+ from product_material
) c on c.product_id = d.product_id
WHERE m.id = d.plan_id
AND isnull(department_id, 0) = $department_id
@@ -47,7 +47,7 @@ class ProduceService
AND plan_num IS NOT NULL
AND m.date = '$date'
");
-
+
foreach($items as $item) {
DB::table("material_plan_day")->insert([
'date' => $date,
@@ -76,7 +76,7 @@ class ProduceService
c.name as product_unit,
a.product_num,
a.material_id,
- d.category as category_name,
+ dc.name as category_name,
d.name as material_name,
a.material_num,
a.total_num,
@@ -87,9 +87,10 @@ class ProduceService
from material_plan_day a
left join product b on a.product_id = b.id
left join product_unit AS c ON b.unit_id = c.id
- left join product_material d on a.Material_Id = d.id
- left join department e on a.Dept_Id = e.id
- where a.date = '$date' and a.Dept_Id = $department_id
+ left join product d on a.material_id = d.id
+ left join product_category dc on dc.id = d.category_id
+ left join department e on a.dept_id = e.id
+ where a.date = '$date' and a.dept_Id = $department_id
");
}
return $rows;
@@ -1021,21 +1022,21 @@ class ProduceService
}
$sql2[] = "select p.id,
- pc.id as category_id,
- pc.code as category_code,
- pc.name as category_name,
+ pc.id as category_id,
+ pc.code as category_code,
+ pc.name as category_name,
p.id as product_id,
- p.code as product_code,
- p.name as product_name,
- p.spec as product_spec,
- Concat(p.name,' ', isnull(p.spec,'')) as product_name_spec,
+ p.code as product_code,
+ p.name as product_name,
+ p.spec as product_spec,
+ Concat(p.name,' ', isnull(p.spec,'')) as product_name_spec,
isnull(batch_sn,'') as batch_sn,
pu.name as product_unit,
sum(wf_num) dphz_num,
sum(wf_num_ydk) ydk_num,
sum(wf_num_wdk) wdk_num,
sum(kc_num) kc_num,
- ISNULL(sum(wf_num), 0) - ISNULL(sum(kc_num), 0) as xqzc_num,
+ ISNULL(sum(wf_num), 0) - ISNULL(sum(kc_num), 0) as xqzc_num,
ISNULL(sum(wf_num_ydk) ,0) as yhk_num,
ISNULL(sum(wf_num_ydk), 0) - ISNULL(sum(kc_num), 0) as kfzc_num,
ISNULL(sum(wfhjh_num), 0) - ISNULL(sum(kc_num), 0) as kfjh_num,
@@ -1057,8 +1058,7 @@ class ProduceService
$sql2[] = "and p.is_export = 1";
}
- $sql2[] = "group by pc.id,pc.name,pc.code,p.id,p.code,p.name,isnull(batch_sn,''),p.spec,pu.name
- order by p.code";
+ $sql2[] = "group by pc.id,pc.name,pc.code,p.id,p.code,p.name,isnull(batch_sn,''),p.spec,pu.name order by p.code";
$rows = DB::select(join(' ', $sql2));
return $rows;
}
diff --git a/app/Gdoo/Product/Controllers/MaterialController.php b/app/Gdoo/Product/Controllers/MaterialController.php
new file mode 100644
index 00000000..c81cf083
--- /dev/null
+++ b/app/Gdoo/Product/Controllers/MaterialController.php
@@ -0,0 +1,176 @@
+ 'product_material',
+ 'referer' => 1,
+ 'search' => ['by' => ''],
+ ]);
+
+ $cols = $header['cols'];
+
+ $cols['actions']['options'] = [[
+ 'name' => '编辑',
+ 'action' => 'edit',
+ 'display' => $this->access['edit'],
+ ]];
+
+ $header['buttons'] = [
+ ['name' => '删除', 'icon' => 'fa-remove', 'action' => 'delete', 'display' => $this->access['delete']],
+ ['name' => '导出', 'icon' => 'fa-share', 'action' => 'export', 'display' => 1],
+ ];
+
+ $header['right_buttons'] = [
+ ['name' => '导入', 'icon' => 'fa-mail-reply', 'color' => 'default', 'action' => 'import', 'display' => $this->access['import']],
+ ];
+
+ $header['cols'] = $cols;
+ $header['tabs'] = ProductMaterial::$tabs;
+ $header['bys'] = ProductMaterial::$bys;
+
+ $search = $header['search_form'];
+ $query = $search['query'];
+
+ if (Request::method() == 'POST') {
+ $model = DB::table($header['table'])->setBy($header);
+ foreach ($header['join'] as $join) {
+ $model->leftJoin($join[0], $join[1], $join[2], $join[3]);
+ }
+ $model->orderBy($header['sort'], $header['order']);
+ $model->where('product_id_product.id', '>', 0);
+ $model->where('product_id_product.status', 1);
+
+ foreach ($search['where'] as $where) {
+ if ($where['active']) {
+ $model->search($where);
+ }
+ }
+
+ $model->select($header['select']);
+ $rows = $model->paginate($query['limit'])->appends($query);
+ return Grid::dataFilters($rows, $header);
+ }
+
+ return $this->display([
+ 'header' => $header,
+ ]);
+ }
+
+ public function create($action = 'edit')
+ {
+ $id = (int)Request::get('id');
+ $form = Form::make(['code' => 'product_material', 'id' => $id, 'action' => $action]);
+
+ return $this->display([
+ 'form' => $form,
+ ], 'create');
+ }
+
+ public function edit()
+ {
+ return $this->create();
+ }
+
+ public function show()
+ {
+ return $this->create('edit');
+ }
+
+ public function list()
+ {
+ $gets = Request::all();
+ if ($gets['product_id']) {
+ $header = Grid::header([
+ 'code' => 'product_material',
+ ]);
+ $model = ProductMaterial::where('product_id', $gets['product_id']);
+ foreach ($header['join'] as $join) {
+ $model->leftJoin($join[0], $join[1], $join[2], $join[3]);
+ }
+
+ $model->leftJoin('product_unit as material_unit', 'material_unit.id', '=', 'material_id_product.unit_id');
+
+ $model->where('product_id_product.status', 1);
+ $model->orderBy('product_material.id', 'asc');
+
+ $header['select'][] = 'material_id_product.code as material_code';
+ $header['select'][] = 'material_id_product.spec as material_spec';
+ $header['select'][] = 'material_id_product.barcode as material_barcode';
+ $header['select'][] = 'material_unit.name as material_unit';
+
+ $rows = $model->get($header['select']);
+ $rows = Grid::dataFilters($rows, $header, function($row) {
+ $row['material_name'] = $row['material_id_name'];
+ $row['warehouse_name'] = $row['warehouse_id_name'];
+ return $row;
+ });
+ } else {
+ $rows = ['data' =>[], 'header' => []];
+ }
+ return $rows;
+ }
+
+ public function getMaterials()
+ {
+ $gets = Request::all();
+ if ($gets['product_id']) {
+ $rows = ProductMaterial::leftJoin('product', 'product.id', '=', 'product_material.material_id')
+ ->leftJoin('product_unit', 'product_unit.id', '=', 'product.unit_id')
+ ->leftJoin('warehouse', 'warehouse.id', '=', 'product.warehouse_id')
+ ->where('product_material.product_id', $gets['product_id'])
+ ->selectRaw('
+ product_material.quantity,
+ product_material.quantity base_quantity,
+ product_material.loss_rate,
+ product.warehouse_id,
+ warehouse.name warehouse_id_name,
+ product_material.material_id product_id,
+ product.spec product_code,
+ product.name product_name,
+ product.spec product_spec,
+ product.barcode product_barcode,
+ product.purchase_price price,
+ product_unit.name product_unit
+ ')
+ ->get();
+
+ return $this->json($rows, true);
+ }
+ }
+
+ public function import()
+ {
+ if (Request::method() == 'POST') {
+ return Form::import(['table' => 'product_material', 'keys' => ['product_id', 'material_id']]);
+ }
+ $tips = '注意：表格里必须包含[存货编码,物料编码]列。';
+ return $this->render(['tips' => $tips], 'layouts.import');
+ }
+
+ public function delete()
+ {
+ if (Request::method() == 'POST') {
+ $ids = Request::get('id');
+ return Form::remove(['code' => 'product_material', 'ids' => $ids]);
+ }
+ }
+}
diff --git a/app/Gdoo/Product/Hooks/MaterialHook.php b/app/Gdoo/Product/Hooks/MaterialHook.php
new file mode 100644
index 00000000..5f5c0b28
--- /dev/null
+++ b/app/Gdoo/Product/Hooks/MaterialHook.php
@@ -0,0 +1,56 @@
+fill($row)->save();
+ $id = $_bom->id;
+ }
+
+ // 删除记录
+ foreach((array)$material_data['deleteds'] as $row) {
+ if ($row['id'] > 0) {
+ ProductMaterial::where('id', $row['id'])->delete();
+ }
+ }
+
+ $master['id'] = $id;
+ $params['master'] = $master;
+
+ // 终止执行的进程后
+ $params['terminate'] = false;
+ return $params;
+ }
+
+ public function onAfterStore($params) {
+ return $params;
+ }
+
+ public function onBeforeDelete($params) {
+ return $params;
+ }
+
+}
\ No newline at end of file
diff --git a/app/Gdoo/Product/Models/Product.php b/app/Gdoo/Product/Models/Product.php
index a010654b..2806a569 100644
--- a/app/Gdoo/Product/Models/Product.php
+++ b/app/Gdoo/Product/Models/Product.php
@@ -39,4 +39,9 @@ class Product extends BaseModel
{
return $this->belongsTo('Gdoo\Product\Models\Warehouse');
}
+
+ public function scopeDialog($q, $value)
+ {
+ return $q->whereIn('id', $value)->pluck('name', 'id');
+ }
}
diff --git a/app/Gdoo/Produce/Models/Formula.php b/app/Gdoo/Product/Models/ProductMaterial.php
similarity index 52%
rename from app/Gdoo/Produce/Models/Formula.php
rename to app/Gdoo/Product/Models/ProductMaterial.php
index 8e60851e..4ad40271 100644
--- a/app/Gdoo/Produce/Models/Formula.php
+++ b/app/Gdoo/Product/Models/ProductMaterial.php
@@ -1,22 +1,24 @@
- 'tab',
+ 'name' => 'tab',
'items' => [
- ['value' => 'material.index', 'url' => 'produce/material/index', 'name' => '原辅料档案'],
+ ['value' => 'material.index', 'url' => 'product/material/index', 'name' => '物料清单'],
]
];
public static $bys = [
- 'name' => 'by',
+ 'name' => 'by',
'items' => [
['value' => '', 'name' => '全部'],
+ ['value' => 'enabled', 'name' => '启用'],
+ ['value' => 'disabled', 'name' => '禁用'],
['value' => 'divider'],
['value' => 'day', 'name' => '今日创建'],
['value' => 'week', 'name' => '本周创建'],
diff --git a/app/Gdoo/Product/config.php b/app/Gdoo/Product/config.php
index cae61d71..35397e87 100644
--- a/app/Gdoo/Product/config.php
+++ b/app/Gdoo/Product/config.php
@@ -5,6 +5,7 @@ return [
"description" => "产品列表,产品类别,库存类型,仓库类别,库存管理,仓库列表。",
"listens" => [
'product_category' => 'Gdoo\Product\Hooks\CategoryHook',
+ 'product_material' => 'Gdoo\Product\Hooks\MaterialHook',
],
'dialogs' => [
'product' => [
@@ -62,7 +63,7 @@ return [
]
],
"material" => [
- "name" => "原材料清单",
+ "name" => "物料清单",
"actions" => [
"index" => [
"name" => "列表"
@@ -73,9 +74,15 @@ return [
"edit" => [
"name" => "编辑"
],
+ "show" => [
+ "name" => "显示"
+ ],
+ "import" => [
+ "name" => "导入"
+ ],
"delete" => [
"name" => "删除"
- ],
+ ]
]
],
"category" => [
diff --git a/app/Gdoo/Product/views/material/create.blade.php b/app/Gdoo/Product/views/material/create.blade.php
new file mode 100644
index 00000000..a8b8b3b1
--- /dev/null
+++ b/app/Gdoo/Product/views/material/create.blade.php
@@ -0,0 +1,119 @@
+
+
+
+
+ {{$form['btn']}}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/Gdoo/Product/views/material/index.blade.php b/app/Gdoo/Product/views/material/index.blade.php
new file mode 100644
index 00000000..c75a9bf7
--- /dev/null
+++ b/app/Gdoo/Product/views/material/index.blade.php
@@ -0,0 +1,46 @@
+