|
@@ -6,6 +6,7 @@ namespace app\api\controller;
|
|
|
use app\common\controller\Api;
|
|
use app\common\controller\Api;
|
|
|
use Monolog\Handler\IFTTTHandler;
|
|
use Monolog\Handler\IFTTTHandler;
|
|
|
use think\Db;
|
|
use think\Db;
|
|
|
|
|
+use think\Request;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 工单资料管理
|
|
* 工单资料管理
|
|
@@ -160,6 +161,21 @@ class WorkOrder extends Api
|
|
|
'建档用户' => rtrim($value['Sys_id']),
|
|
'建档用户' => rtrim($value['Sys_id']),
|
|
|
'建档时间' => rtrim($value['Sys_rq']),
|
|
'建档时间' => rtrim($value['Sys_rq']),
|
|
|
'更新时间' => rtrim($value['Mod_rq']),
|
|
'更新时间' => rtrim($value['Mod_rq']),
|
|
|
|
|
+ 'zzdh1' => rtrim($value['yj_zzdh1']),
|
|
|
|
|
+ 'zzdh2' => rtrim($value['yj_zzdh2']),
|
|
|
|
|
+ 'zzdh3' => rtrim($value['yj_zzdh3']),
|
|
|
|
|
+ 'zzdh4' => rtrim($value['yj_zzdh4']),
|
|
|
|
|
+ 'zzmc1' => rtrim($value['yj_zzmc1']),
|
|
|
|
|
+ 'zzmc2' => rtrim($value['yj_zzmc2']),
|
|
|
|
|
+ 'zzmc3' => rtrim($value['yj_zzmc3']),
|
|
|
|
|
+ 'zzmc4' => rtrim($value['yj_zzmc4']),
|
|
|
|
|
+ '订单数量' => rtrim($value['yj_成品数量']),
|
|
|
|
|
+ '万小张' => rtrim($value['yj_实际投料']),
|
|
|
|
|
+ '开数' => rtrim($value['yj_ks']),
|
|
|
|
|
+ '联数' => rtrim($value['yj_ls']),
|
|
|
|
|
+ '核算规格' => rtrim($value['Yj_核算规格']),
|
|
|
|
|
+ '备注' => rtrim($value['yj_desc']),
|
|
|
|
|
+ 'Uniqid' => rtrim($value['Uniqid'])
|
|
|
];
|
|
];
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -657,7 +673,8 @@ class WorkOrder extends Api
|
|
|
'Gy0_gxmc' => ['like','%检%']
|
|
'Gy0_gxmc' => ['like','%检%']
|
|
|
];
|
|
];
|
|
|
$filed = 'rtrim(Gy0_gdbh) as gdbh,rtrim(Gy0_yjno) as yjno,rtrim(Gy0_gxh) as gxh,rtrim(Gy0_gxmc) as gxmc,rtrim(人工检_正品板) as 人工正品板,
|
|
$filed = 'rtrim(Gy0_gdbh) as gdbh,rtrim(Gy0_yjno) as yjno,rtrim(Gy0_gxh) as gxh,rtrim(Gy0_gxmc) as gxmc,rtrim(人工检_正品板) as 人工正品板,
|
|
|
- rtrim(人工检_次品板) as 人工次品板,rtrim(人工检_废检) as 人工废检,rtrim(机检_正品板) as 机检正品板,rtrim(机检_次品板) as 机检次品板,rtrim(机检_废检) as 机检废检,rtrim(Gy0_sbbh) as 设备编号';
|
|
|
|
|
|
|
+ rtrim(人工检_次品板) as 人工次品板,rtrim(人工检_废检) as 人工废检,rtrim(机检_正品板) as 机检正品板,rtrim(机检_次品板) as 机检次品板,
|
|
|
|
|
+ rtrim(机检_废检) as 机检废检,rtrim(Gy0_sbbh) as 设备编号,rtrim(Uniqid) as Uniqid';
|
|
|
$list = Db::table('工单_工艺资料')->where($where)->field($filed)->select();
|
|
$list = Db::table('工单_工艺资料')->where($where)->field($filed)->select();
|
|
|
if (empty($list)){
|
|
if (empty($list)){
|
|
|
$this->error('未找到该工单工艺');
|
|
$this->error('未找到该工单工艺');
|
|
@@ -752,7 +769,7 @@ class WorkOrder extends Api
|
|
|
}
|
|
}
|
|
|
$field = 'rtrim(Gy0_方案) as 方案,rtrim(Gy0_yjno) as yjno,rtrim(Gy0_gxh) as gxh,rtrim(Gy0_gxmc) as gxmc,rtrim(Add_gxmc) as add_gxmc,
|
|
$field = 'rtrim(Gy0_方案) as 方案,rtrim(Gy0_yjno) as yjno,rtrim(Gy0_gxh) as gxh,rtrim(Gy0_gxmc) as gxmc,rtrim(Add_gxmc) as add_gxmc,
|
|
|
rtrim(Gy0_sbbh) as 参照设备,rtrim(工价系数) as 难度系数,rtrim(Gy0_shdh) as 损耗代号,rtrim(Gy0_Rate0) as 基础损耗,rtrim(Gy0_Rate1) as 损耗率,
|
|
rtrim(Gy0_sbbh) as 参照设备,rtrim(工价系数) as 难度系数,rtrim(Gy0_shdh) as 损耗代号,rtrim(Gy0_Rate0) as 基础损耗,rtrim(Gy0_Rate1) as 损耗率,
|
|
|
- rtrim(印刷方式) as 印刷方式,rtrim(版距) as 版距,rtrim(Gy0_ms) as 计损色数,rtrim(损耗系数) as 损耗系数';
|
|
|
|
|
|
|
+ rtrim(印刷方式) as 印刷方式,rtrim(版距) as 版距,rtrim(Gy0_ms) as 计损色数,rtrim(损耗系数) as 损耗系数,rtrim(UniqId) as UniqId';
|
|
|
$list = Db::table('工单_工艺资料')->where('Gy0_gdbh',$workOrder)->field($field)->select();
|
|
$list = Db::table('工单_工艺资料')->where('Gy0_gdbh',$workOrder)->field($field)->select();
|
|
|
if (empty($list)){
|
|
if (empty($list)){
|
|
|
$this->error('未找到该工单工艺资料');
|
|
$this->error('未找到该工单工艺资料');
|
|
@@ -770,19 +787,11 @@ class WorkOrder extends Api
|
|
|
$this->success('成功',$list);
|
|
$this->success('成功',$list);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- //
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 修正工单核算参数->参数修改
|
|
* 修正工单核算参数->参数修改
|
|
|
- * @ApiMethod (GET)
|
|
|
|
|
- * @param string workorder 工单编号
|
|
|
|
|
- * @param string processCode 工序号
|
|
|
|
|
- * @param float difficulty 难度系数
|
|
|
|
|
- * @param string loss 损耗代号
|
|
|
|
|
- * @param string peintMode 印刷方式
|
|
|
|
|
- * @param float plate 版距
|
|
|
|
|
- * @param float chromatic 计损色数
|
|
|
|
|
- * @param float wastage 损耗系数
|
|
|
|
|
|
|
+ * @ApiMethod (POST)
|
|
|
|
|
+ * @param void
|
|
|
* @return void
|
|
* @return void
|
|
|
* @throws \think\Exception
|
|
* @throws \think\Exception
|
|
|
* @throws \think\db\exception\DataNotFoundException
|
|
* @throws \think\db\exception\DataNotFoundException
|
|
@@ -792,47 +801,88 @@ class WorkOrder extends Api
|
|
|
*/
|
|
*/
|
|
|
public function AccountingParameterEdit()
|
|
public function AccountingParameterEdit()
|
|
|
{
|
|
{
|
|
|
- if ($this->request->isPost() === false){
|
|
|
|
|
|
|
+ if (Request::instance()->isPost() === false){
|
|
|
$this->error('请求错误');
|
|
$this->error('请求错误');
|
|
|
}
|
|
}
|
|
|
- $workOrder = input('workOrder');
|
|
|
|
|
- $processCode = input('processCode');
|
|
|
|
|
- if (empty($workOrder) || empty($processCode)){
|
|
|
|
|
|
|
+ $param = Request::instance()->post();
|
|
|
|
|
+ if (empty($param) || isset($param[0]['Uniqid']) === false){
|
|
|
$this->error('参数错误');
|
|
$this->error('参数错误');
|
|
|
}
|
|
}
|
|
|
- $row = [
|
|
|
|
|
- '工价系数' => input('difficulty'),
|
|
|
|
|
- 'Gy0_shdh' => input('loss'),
|
|
|
|
|
- '印刷方式' => input('printMode'),
|
|
|
|
|
- '版距' => input('plate'),
|
|
|
|
|
- 'Gy0_ms' => input('chromatic'),
|
|
|
|
|
- '损耗系数' => input('wastage'),
|
|
|
|
|
- ];
|
|
|
|
|
- //根据损耗代号获取基础损耗、损耗率
|
|
|
|
|
- $data = Db::table('dic_lzsh')->where('sys_bh',$row['Gy0_shdh'])->field('rtrim(sys_rate0) as rate0,rtrim(sys_rate1) as rate1')->find();
|
|
|
|
|
- $row['基础损耗'] = $data['rate0'];
|
|
|
|
|
- $row['损耗率'] = $data['rate1'];
|
|
|
|
|
- $sql = Db::table('工单_工艺资料')->where(['Gy0_gdbh'=>$workOrder,'Gy0_gxh'=>$processCode])->fetchSql(true)->update($row);
|
|
|
|
|
- $res = Db::query($sql);
|
|
|
|
|
- if ($res !== false){
|
|
|
|
|
|
|
+ $i = 0;
|
|
|
|
|
+ foreach ($param as $key=>$value){
|
|
|
|
|
+ $data = Db::table('dic_lzsh')->where('sys_bh',$value['loss'])->field('rtrim(sys_rate0) as rate0,rtrim(sys_rate1) as rate1')->find();
|
|
|
|
|
+ $row = [
|
|
|
|
|
+ '工价系数' => $value['difficulty']?:'',
|
|
|
|
|
+ 'Gy0_shdh' => $value['loss']?:'',
|
|
|
|
|
+ '印刷方式' => $value['printMode']?:'',
|
|
|
|
|
+ '版距' => $value['plate']?:'',
|
|
|
|
|
+ 'Gy0_ms' => $value['chromatic']?:'',
|
|
|
|
|
+ '损耗系数' => $value['wastage']?:'',
|
|
|
|
|
+ 'Gy0_Rate0' => $data['rate0'],
|
|
|
|
|
+ 'Gy0_Rate1' => $data['rate1']
|
|
|
|
|
+ ];
|
|
|
|
|
+ $sql = Db::table('工单_工艺资料')->where('Uniqid',$value['Uniqid'])->fetchSql(true)->update($row);
|
|
|
|
|
+ $res = Db::query($sql);
|
|
|
|
|
+ if ($res !== false){
|
|
|
|
|
+ $i++;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ if ($i !== 0){
|
|
|
$this->success('成功');
|
|
$this->success('成功');
|
|
|
}else{
|
|
}else{
|
|
|
$this->error('失败');
|
|
$this->error('失败');
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- //工单工序产量统计
|
|
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 印件资料修改
|
|
|
|
|
+ * @ApiMethod (POST)
|
|
|
|
|
+ * @param void
|
|
|
|
|
+ * @return void
|
|
|
|
|
+ * @throws \think\Exception
|
|
|
|
|
+ * @throws \think\exception\PDOException
|
|
|
|
|
+ */
|
|
|
|
|
|
|
|
- public function OutputStatistics()
|
|
|
|
|
|
|
+ public function PrintedEdit()
|
|
|
{
|
|
{
|
|
|
- if ($this->request->isGet() === false){
|
|
|
|
|
|
|
+ if ($this->request->isPost() === false){
|
|
|
$this->error('请求错误');
|
|
$this->error('请求错误');
|
|
|
}
|
|
}
|
|
|
- $workOrder = input('workOrder');
|
|
|
|
|
- if (empty($workOrder)){
|
|
|
|
|
|
|
+ $param = $this->request->param();
|
|
|
|
|
+ if (empty($param) || isset($param['Uniqid']) === false){
|
|
|
$this->error('参数错误');
|
|
$this->error('参数错误');
|
|
|
}
|
|
}
|
|
|
-// $filed = 'rtrim(Gy0_yjno) as yjno,rtrim(Gy0_gxh) as gxh,rtrim(Gy0_gxmc) as gxmc,rtrim(Add_gxmc) as add_gxmc,rtrim(Gy0_计划接货数) as 工序计划产量,
|
|
|
|
|
-// rtrim(Gy0_ls) as 联数,'
|
|
|
|
|
|
|
+ $data = [
|
|
|
|
|
+ 'yj_Yjno' => isset($param['yjno'])?$param['yjno']:'',
|
|
|
|
|
+ 'yj_Yjdh' => isset($param['yjdh'])?$param['yjdh']:'',
|
|
|
|
|
+ 'yj_yjmc' => isset($param['yjmc'])?$param['yjmc']:'',
|
|
|
|
|
+ 'yj_zzdh' => isset($param['zzdh'])?$param['zzdh']:'',
|
|
|
|
|
+ 'yj_zzdh1' => isset($param['zzdh1'])?$param['zzdh1']:'',
|
|
|
|
|
+ 'yj_zzdh2' => isset($param['zzdh2'])?$param['zzdh2']:'',
|
|
|
|
|
+ 'yj_zzdh3' => isset($param['zzdh3'])?$param['zzdh3']:'',
|
|
|
|
|
+ 'yj_zzdh4' => isset($param['zzdh4'])?$param['zzdh4']:'',
|
|
|
|
|
+ 'yj_zzmc' => isset($param['zzmc'])?$param['zzmc']:'',
|
|
|
|
|
+ 'yj_zzmc1' => isset($param['zzmc1'])?$param['zzmc1']:'',
|
|
|
|
|
+ 'yj_zzmc2' => isset($param['zzmc2'])?$param['zzmc2']:'',
|
|
|
|
|
+ 'yj_zzmc3' => isset($param['zzmc3'])?$param['zzmc3']:'',
|
|
|
|
|
+ 'yj_zzmc4' => isset($param['zzmc4'])?$param['zzmc4']:'',
|
|
|
|
|
+ 'yj_成品数量' => isset($param['cpsl'])?$param['cpsl']:'',
|
|
|
|
|
+ 'yj_实际投料' => isset($param['sjtl'])?$param['sjtl']:'',
|
|
|
|
|
+ 'yj_平张投料' => isset($param['pztl'])?$param['pztl']:'',
|
|
|
|
|
+ 'yj_tlgg' => isset($param['tlgg'])?$param['tlgg']:'',
|
|
|
|
|
+ 'yj_klgg' => isset($param['klgg'])?$param['klgg']:'',
|
|
|
|
|
+ 'Yj_核算规格' => isset($param['hsgg'])?$param['hsgg']:'',
|
|
|
|
|
+ 'yj_ks' => isset($param['ks'])?$param['ks']:'',
|
|
|
|
|
+ 'yj_ls' => isset($param['ls'])?$param['ls']:'',
|
|
|
|
|
+ 'yj_desc' => isset($param['desc'])?$param['desc']:'',
|
|
|
|
|
+ ];
|
|
|
|
|
+ $sql = Db::table('工单_印件资料')->where('Uniqid',$param['Uniqid'])->fetchSql(true)->update($data);
|
|
|
|
|
+ $res = Db::query($sql);
|
|
|
|
|
+ if ($res !== false){
|
|
|
|
|
+ $this->success('成功');
|
|
|
|
|
+ }else{
|
|
|
|
|
+ $this->error('失败');
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|