|
@@ -1109,11 +1109,17 @@ class WorkOrder extends Api
|
|
|
$param['Mod_rq'] = date('Y-m-d H:i:s',time());
|
|
$param['Mod_rq'] = date('Y-m-d H:i:s',time());
|
|
|
$UniqId = $param['UniqId'];
|
|
$UniqId = $param['UniqId'];
|
|
|
unset($param['UniqId']);
|
|
unset($param['UniqId']);
|
|
|
|
|
+ //获取工单第一道工艺编号
|
|
|
|
|
+ $minGxh = \db('工单_工艺资料')->where('Gy0_gdbh',$param['Gy0_gdbh'])->column('min(Gy0_gxh) as gxh');
|
|
|
//修改工艺资料
|
|
//修改工艺资料
|
|
|
$sql = \db('工单_工艺资料')->where('UniqId',$UniqId)->fetchSql(true)->update($param);
|
|
$sql = \db('工单_工艺资料')->where('UniqId',$UniqId)->fetchSql(true)->update($param);
|
|
|
$res = Db::query($sql);
|
|
$res = Db::query($sql);
|
|
|
//获取工艺资料数据
|
|
//获取工艺资料数据
|
|
|
$list = \db('工单_工艺资料')->where('UniqId',$UniqId)->field('Gy0_yjno,Gy0_gxh,rtrim(Gy0_计划接货数) as 计划接货数')->find();
|
|
$list = \db('工单_工艺资料')->where('UniqId',$UniqId)->field('Gy0_yjno,Gy0_gxh,rtrim(Gy0_计划接货数) as 计划接货数')->find();
|
|
|
|
|
+ //如果是第一道工序需从印件资料中获取计划产量
|
|
|
|
|
+ if ($minGxh[0] === $param['Gy0_gxh']){
|
|
|
|
|
+ $list['计划接货数'] = \db('工单_印件资料')->where('Yj_Gdbh',$param['Gy0_gdbh'])->where('yj_Yjno',$param['Gy0_yjno'])->column('yj_平张投料')[0];
|
|
|
|
|
+ }
|
|
|
//修改工单状态
|
|
//修改工单状态
|
|
|
$status = \db('工单_基本资料')->where('Gd_gdbh',$param['Gy0_gdbh'])->field('rtrim(gd_statu) as status')->find();
|
|
$status = \db('工单_基本资料')->where('Gd_gdbh',$param['Gy0_gdbh'])->field('rtrim(gd_statu) as status')->find();
|
|
|
if ($status['status'] !== '2-生产中'){
|
|
if ($status['status'] !== '2-生产中'){
|
|
@@ -2287,19 +2293,19 @@ class WorkOrder extends Api
|
|
|
unset($ProcessList[$key]['Gy0_Oil'],$ProcessList[$key]['Gy0_Ms'],$ProcessList[$key]['Gy0_Ks'],$ProcessList[$key]['UniqID'],$ProcessList[$key]['Gy0_cpdh'],$ProcessList[$key]['gy0_gxmc'],$ProcessList[$key]['Gy0_site']);
|
|
unset($ProcessList[$key]['Gy0_Oil'],$ProcessList[$key]['Gy0_Ms'],$ProcessList[$key]['Gy0_Ks'],$ProcessList[$key]['UniqID'],$ProcessList[$key]['Gy0_cpdh'],$ProcessList[$key]['gy0_gxmc'],$ProcessList[$key]['Gy0_site']);
|
|
|
}
|
|
}
|
|
|
//插入数据
|
|
//插入数据
|
|
|
- \db()->startTrans();
|
|
|
|
|
- try {
|
|
|
|
|
- \db('工单_工艺资料')->where('Gy0_gdbh',$param['workorder'])->delete();
|
|
|
|
|
- $processSql = \db('工单_工艺资料')->fetchSql(true)->insertAll($ProcessList);
|
|
|
|
|
- \db()->query($processSql);
|
|
|
|
|
- \db('工单_印件资料')->where('Yj_Gdbh',$param['workorder'])->delete();
|
|
|
|
|
- $printSql = \db('工单_印件资料')->fetchSql(true)->insertAll($PrintList);
|
|
|
|
|
- \db()->query($printSql);
|
|
|
|
|
- \db()->commit();
|
|
|
|
|
- }catch (\Exception $e){
|
|
|
|
|
- \db()->rollback();
|
|
|
|
|
-// echo $e->getMessage();
|
|
|
|
|
- }
|
|
|
|
|
|
|
+// \db()->startTrans();
|
|
|
|
|
+// try {
|
|
|
|
|
+// \db('工单_工艺资料')->where('Gy0_gdbh',$param['workorder'])->delete();
|
|
|
|
|
+// $processSql = \db('工单_工艺资料')->fetchSql(true)->insertAll($ProcessList);
|
|
|
|
|
+// \db()->query($processSql);
|
|
|
|
|
+// \db('工单_印件资料')->where('Yj_Gdbh',$param['workorder'])->delete();
|
|
|
|
|
+// $printSql = \db('工单_印件资料')->fetchSql(true)->insertAll($PrintList);
|
|
|
|
|
+// \db()->query($printSql);
|
|
|
|
|
+// \db()->commit();
|
|
|
|
|
+// }catch (\Exception $e){
|
|
|
|
|
+// \db()->rollback();
|
|
|
|
|
+//// echo $e->getMessage();
|
|
|
|
|
+// }
|
|
|
//计算工序计划生产数量
|
|
//计算工序计划生产数量
|
|
|
if ($number !== null){
|
|
if ($number !== null){
|
|
|
$list = \db('工单_印件资料')->where('Yj_Gdbh',$param['workorder'])->field('yj_Yjno,yj_平张投料')->select();
|
|
$list = \db('工单_印件资料')->where('Yj_Gdbh',$param['workorder'])->field('yj_Yjno,yj_平张投料')->select();
|