hawind/gdoo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

删除无用的注释和文件

Browse Source
This commit is contained in:
hawind
2021-03-02 01:08:44 +08:00
parent 8f5b66bb92
commit 89bab045dd
147 changed files with 214 additions and 9816 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Gdoo/Stock/Controllers/AllocationController.php
-13
View File
@@ -18,7 +18,6 @@ class AllocationController extends WorkflowController
{
public $permission = ['dialog', 'logistics', 'stockSelect'];
// 列表
public function indexAction()
{
$header = Grid::header([
@@ -72,7 +71,6 @@ class AllocationController extends WorkflowController
]);
}
// 新建
public function createAction($action = 'edit')
{
$id = (int) Request::get('id');
@@ -87,25 +85,21 @@ class AllocationController extends WorkflowController
], $tpl);
}
// 编辑
public function editAction()
{
return $this->createAction();
}
// 审核
public function auditAction()
{
return $this->createAction('audit');
}
// 显示
public function showAction()
{
return $this->createAction('show');
}
// 打印
public function printAction()
{
$id = Request::get('id');
@@ -138,17 +132,10 @@ class AllocationController extends WorkflowController
'template' => DB::table('model_template')->where('id', $template_id)->first()
];
if ($master['in_warehouse_code'] == 27 || $master['in_warehouse_code'] == 21) {
$warehouse_by = '李志全';
} else {
$warehouse_by = '万海英';
}
$tpl = $this->display([
'master' => $master,
'rows' => $rows,
'form' => $form,
'warehouse_by' => $warehouse_by,
], 'print/'.$template_id);
return $tpl;
}
app/Gdoo/Stock/Controllers/CancelController.php
-7
View File
@@ -16,7 +16,6 @@ class CancelController extends WorkflowController
{
public $permission = ['dialog'];
// 列表
public function indexAction()
{
$header = Grid::header([
@@ -74,7 +73,6 @@ class CancelController extends WorkflowController
]);
}
// 新建
public function createAction($action = 'edit')
{
$id = (int) Request::get('id');
@@ -89,25 +87,21 @@ class CancelController extends WorkflowController
], $tpl);
}
// 编辑
public function editAction()
{
return $this->createAction();
}
// 审核
public function auditAction()
{
return $this->createAction('audit');
}
// 显示
public function showAction()
{
return $this->createAction('show');
}
// 打印
public function printAction()
{
$id = Request::get('id');
@@ -174,7 +168,6 @@ class CancelController extends WorkflowController
]);
}
// 删除
public function deleteAction()
{
if (Request::method() == 'POST') {
app/Gdoo/Stock/Controllers/CategoryController.php
-6
View File
@@ -68,7 +68,6 @@ class CategoryController extends DefaultController
]);
}
// 新建客户联系人
public function createAction()
{
$id = (int)Request::get('id');
@@ -78,15 +77,11 @@ class CategoryController extends DefaultController
], 'create');
}
// 创建客户联系人
public function editAction()
{
return $this->createAction();
}
/**
* 弹出层信息
*/
public function dialogAction()
{
$header = Grid::header([
@@ -123,7 +118,6 @@ class CategoryController extends DefaultController
], 'dialog');
}
// 删除
public function deleteAction()
{
if (Request::method() == 'POST') {
app/Gdoo/Stock/Controllers/DeliveryController.php
-9
View File
@@ -33,7 +33,6 @@ class DeliveryController extends WorkflowController
'autoSave'
];
// 发货列表
public function indexAction()
{
$header = Grid::header([
@@ -115,7 +114,6 @@ class DeliveryController extends WorkflowController
]);
}
// 明细列表
public function detailAction()
{
$header = Grid::header([
@@ -185,7 +183,6 @@ class DeliveryController extends WorkflowController
]);
}
// 自动保存
public function autoSaveAction()
{
$gets = Request::all();
@@ -245,7 +242,6 @@ class DeliveryController extends WorkflowController
return $this->createAction('audit');
}
// 新建
public function createAction($action = 'edit')
{
$id = (int) Request::get('id');
@@ -269,19 +265,16 @@ class DeliveryController extends WorkflowController
], $tpl);
}
// 编辑
public function editAction()
{
return $this->createAction();
}
// 审核
public function auditAction()
{
return $this->createAction('audit');
}
// 显示
public function showAction()
{
return $this->createAction('show');
@@ -308,7 +301,6 @@ class DeliveryController extends WorkflowController
]);
}
// 打印
public function printAction()
{
$id = Request::get('id');
@@ -430,7 +422,6 @@ class DeliveryController extends WorkflowController
], 'getBatchSelect');
}
// 删除
public function deleteAction()
{
if (Request::method() == 'POST') {
app/Gdoo/Stock/Controllers/DirectController.php
-7
View File
@@ -16,7 +16,6 @@ class DirectController extends WorkflowController
{
public $permission = ['dialog', 'importExcel'];
// 列表
public function indexAction()
{
$header = Grid::header([
@@ -69,7 +68,6 @@ class DirectController extends WorkflowController
]);
}
// 新建
public function createAction($action = 'edit')
{
$id = (int) Request::get('id');
@@ -84,25 +82,21 @@ class DirectController extends WorkflowController
], $tpl);
}
// 编辑
public function editAction()
{
return $this->createAction();
}
// 审核
public function auditAction()
{
return $this->createAction('audit');
}
// 显示
public function showAction()
{
return $this->createAction('show');
}
// 打印
public function printAction()
{
$id = Request::get('id');
@@ -236,7 +230,6 @@ class DirectController extends WorkflowController
return view('importExcel');
}
// 删除
public function deleteAction()
{
if (Request::method() == 'POST') {
app/Gdoo/Stock/Controllers/LocationController.php
-6
View File
@@ -68,7 +68,6 @@ class LocationController extends DefaultController
]);
}
// 新建客户联系人
public function createAction($action = 'edit')
{
$id = (int)Request::get('id');
@@ -78,15 +77,11 @@ class LocationController extends DefaultController
], 'create');
}
// 创建客户联系人
public function editAction()
{
return $this->createAction();
}
/**
* 弹出层信息
*/
public function dialogAction()
{
$header = Grid::header([
@@ -177,7 +172,6 @@ class LocationController extends DefaultController
}
}
// 删除
public function deleteAction()
{
if (Request::method() == 'POST') {
app/Gdoo/Stock/Controllers/Record01Controller.php
-6
View File
@@ -16,7 +16,6 @@ class Record01Controller extends AuditController
{
public $permission = ['dialog'];
// 列表
public function indexAction()
{
$header = Grid::header([
@@ -70,7 +69,6 @@ class Record01Controller extends AuditController
]);
}
// 新建
public function createAction($action = 'edit')
{
$id = (int) Request::get('id');
@@ -85,26 +83,22 @@ class Record01Controller extends AuditController
], $tpl);
}
// 编辑
public function editAction()
{
return $this->createAction();
}
// 显示
public function showAction()
{
return $this->createAction('show');
}
// 打印
public function printAction()
{
$this->layout = 'layouts.print2';
print_prince($this->createAction('print'));
}
// 删除
public function deleteAction()
{
if (Request::method() == 'POST') {
app/Gdoo/Stock/Controllers/Record08Controller.php
-6
View File
@@ -16,7 +16,6 @@ class Record08Controller extends AuditController
{
public $permission = ['dialog', 'importExcel'];
// 列表
public function indexAction()
{
$header = Grid::header([
@@ -70,7 +69,6 @@ class Record08Controller extends AuditController
]);
}
// 新建
public function createAction($action = 'edit')
{
$id = (int) Request::get('id');
@@ -85,19 +83,16 @@ class Record08Controller extends AuditController
], $tpl);
}
// 编辑
public function editAction()
{
return $this->createAction();
}
// 显示
public function showAction()
{
return $this->createAction('show');
}
// 打印
public function printAction()
{
$this->layout = 'layouts.print2';
@@ -155,7 +150,6 @@ class Record08Controller extends AuditController
return view('importExcel');
}
// 删除
public function deleteAction()
{
if (Request::method() == 'POST') {
app/Gdoo/Stock/Controllers/Record09Controller.php
-7
View File
@@ -16,7 +16,6 @@ class Record09Controller extends WorkflowController
{
public $permission = ['dialog'];
// 列表
public function indexAction()
{
$header = Grid::header([
@@ -70,7 +69,6 @@ class Record09Controller extends WorkflowController
]);
}
// 新建
public function createAction($action = 'edit')
{
$id = (int) Request::get('id');
@@ -85,25 +83,21 @@ class Record09Controller extends WorkflowController
], $tpl);
}
// 编辑
public function editAction()
{
return $this->createAction();
}
// 审核
public function auditAction()
{
return $this->createAction();
}
// 显示
public function showAction()
{
return $this->createAction('show');
}
// 打印
public function printAction()
{
$id = Request::get('id');
@@ -146,7 +140,6 @@ class Record09Controller extends WorkflowController
return $tpl;
}
// 删除
public function deleteAction()
{
if (Request::method() == 'POST') {
app/Gdoo/Stock/Controllers/Record10Controller.php
-111
View File
@@ -16,7 +16,6 @@ class Record10Controller extends WorkflowController
{
public $permission = ['dialog', 'print3'];
// 列表
public function indexAction()
{
$header = Grid::header([
@@ -43,15 +42,6 @@ class Record10Controller extends WorkflowController
}
$model->orderBy($header['sort'], $header['order']);
/*
// 外部库管登录
if (auth()->id() == 2177) {
$model->whereIn('stock_record10.warehouse_id', [20001, 20047]);
} else {
$model->whereNotIn('stock_record10.warehouse_id', [20001, 20047]);
}
*/
foreach ($search['where'] as $where) {
if ($where['active']) {
$model->search($where);
@@ -79,7 +69,6 @@ class Record10Controller extends WorkflowController
]);
}
// 新建
public function createAction($action = 'edit')
{
$id = (int) Request::get('id');
@@ -95,25 +84,21 @@ class Record10Controller extends WorkflowController
], $tpl);
}
// 编辑
public function editAction()
{
return $this->createAction();
}
// 审核
public function auditAction()
{
return $this->createAction('audit');
}
// 显示
public function showAction()
{
return $this->createAction('show');
}
// 打印
public function print2Action()
{
$this->layout = 'layouts.print2';
@@ -122,7 +107,6 @@ class Record10Controller extends WorkflowController
print_prince($this->createAction('print'));
}
// 显示促销
public function printAction()
{
$id = Request::get('id');
@@ -172,101 +156,6 @@ class Record10Controller extends WorkflowController
}
}
// 显示促销
public function print3Action()
{
$this->layout = 'layouts.print2';
$id = Request::get('id');
$template_id = Request::get('template_id');
if ($template_id == 117) {
$this->layout = 'layouts.print2';
$master = DB::table('stock_record10 as m')->where('m.id', $id)
->leftJoin('stock_type as st', 'st.id', '=', 'm.type_id')
->leftJoin('department', 'department.id', '=', 'm.department_id')
->leftJoin('warehouse', 'warehouse.id', '=', 'm.warehouse_id')
->selectRaw('m.*, st.name as type_name, warehouse.name as warehouse_name, department.name as department_name')
->first();
$rows = DB::table('stock_record10_data as d')
->leftJoin('stock_record10 as m', 'm.id', '=', 'd.record10_id')
->leftJoin('product as p', 'p.id', '=', 'd.product_id')
->leftJoin('product_unit as pu', 'pu.id', '=', 'p.unit_id')
->leftJoin('stock_type as st', 'st.id', '=', 'm.type_id')
->where('m.id', $id)
->selectRaw('
d.*,
p.name as product_name,
p.code as product_code,
p.spec as product_spec,
st.name as type_name,
pu.name as product_unit
')
->get();
$form = [
'template' => DB::table('model_template')->where('id', $template_id)->first()
];
$template = "report.fr3";
$ver = 3.0;
$id = (int) Request::get('id');
$header['action'] = 'print';
$header['code'] = 'stock_record10';
$header['id'] = $id;
$form = Form::make($header);
$Tables = [];
foreach($form['prints'] as $print) {
$fields = [];
foreach($print['fields'] as $field) {
$type = 'str';
$size = 255;
if ($field['type'] == 'INT' || $field['type'] == 'TINYINT') {
$type = 'int';
$size = 0;
}
if ($field['type'] == 'DATE') {
$type = 'str';
}
if ($field['type'] == 'DECIMAL') {
$type = 'float';
$size = 0;
}
$fields[] = ["type" => $type, "size" => $size, "name" => $field['field'], "required" => false];
}
$Tables[] = [
'Name' => $print['name'],
'Cols' => $fields,
'Data' => $print['data'],
];
}
$jsonObject = [
"template" => $template,
"ver" => $ver,
"Tables" => $Tables,
];
$jsonStr = json_encode($jsonObject);
$tpl = $this->display([
'master' => $master,
'jsonStr' => $jsonStr,
'rows' => $rows,
'form' => $form,
], 'print3/'.$template_id);
return $tpl;
} else {
$tpl = $this->createAction('print');
print_prince($tpl);
}
}
// 删除
public function deleteAction()
{
if (Request::method() == 'POST') {
app/Gdoo/Stock/Controllers/Record11Controller.php
-6
View File
@@ -16,7 +16,6 @@ class Record11Controller extends AuditController
{
public $permission = ['dialog'];
// 列表
public function indexAction()
{
$header = Grid::header([
@@ -69,7 +68,6 @@ class Record11Controller extends AuditController
]);
}
// 新建
public function createAction($action = 'edit')
{
$id = (int) Request::get('id');
@@ -84,19 +82,16 @@ class Record11Controller extends AuditController
], $tpl);
}
// 编辑
public function editAction()
{
return $this->createAction();
}
// 显示
public function showAction()
{
return $this->createAction('show');
}
// 打印
public function printAction()
{
$id = Request::get('id');
@@ -147,7 +142,6 @@ class Record11Controller extends AuditController
}
}
// 删除
public function deleteAction()
{
if (Request::method() == 'POST') {
app/Gdoo/Stock/Controllers/ReportController.php
-12
View File
@@ -99,18 +99,6 @@ class ReportController extends DefaultController
}
$rows = [];
if ($query['filter'] == 1) {
/*
$rows = DB::select('EXEC P_ReportOrderStockTotal ?,?,?,?,?,?,?,?', [
$fields['warehouse_id'],
$fields['product_code'],
$fields['type'],
$fields['date'][0],
$fields['date'][1],
auth()->id(),
$fields['batch'],
$fields['bmj'],
]);
*/
$rows = StockService::reportOrderStockTotal(
$fields['warehouse_id'],
$fields['product_code'],
app/Gdoo/Stock/Controllers/TypeController.php
-6
View File
@@ -68,7 +68,6 @@ class TypeController extends DefaultController
]);
}
// 新建客户联系人
public function createAction()
{
$id = (int)Request::get('id');
@@ -78,15 +77,11 @@ class TypeController extends DefaultController
], 'create');
}
// 创建客户联系人
public function editAction()
{
return $this->createAction();
}
/**
* 弹出层信息
*/
public function dialogAction()
{
$header = Grid::header([
@@ -123,7 +118,6 @@ class TypeController extends DefaultController
], 'dialog');
}
// 删除
public function deleteAction()
{
if (Request::method() == 'POST') {
app/Gdoo/Stock/Controllers/WarehouseController.php
-6
View File
@@ -68,7 +68,6 @@ class WarehouseController extends DefaultController
]);
}
// 新建客户联系人
public function createAction()
{
$id = (int)Request::get('id');
@@ -78,15 +77,11 @@ class WarehouseController extends DefaultController
], 'create');
}
// 创建客户联系人
public function editAction()
{
return $this->createAction();
}
/**
* 弹出层信息
*/
public function dialogAction()
{
$header = Grid::header([
@@ -166,7 +161,6 @@ class WarehouseController extends DefaultController
]);
}
// 删除
public function deleteAction()
{
if (Request::method() == 'POST') {