|
|
@@ -141,6 +141,8 @@ class ProductionLot extends Api
|
|
|
if (!isset($param['gdbh']) || !isset($param['yjno']) || !isset($param['num'])){
|
|
|
$this->success('参数错误');
|
|
|
}
|
|
|
+ $page = $param['page'] ?? 1;
|
|
|
+ $pageSize = $param['pageSize'] ?? 50;
|
|
|
$query= db('设备_产量计酬')
|
|
|
->alias('a')
|
|
|
->field('a.sczl_num as 流程单号,a.sczl_gxh as 工序号,a.sczl_gxmc as 工序名称,a.sczl_rq as 生产日期,
|
|
|
@@ -157,6 +159,7 @@ class ProductionLot extends Api
|
|
|
->where('a.sczl_yjno',$param['yjno'])
|
|
|
->where('a.sczl_num',$param['num'])
|
|
|
->order('工序号,生产日期')
|
|
|
+ ->page($page,$pageSize)
|
|
|
->select();
|
|
|
$total = count($list);
|
|
|
$data = [
|
|
|
@@ -186,6 +189,8 @@ class ProductionLot extends Api
|
|
|
if (!isset($param['gdbh']) || !isset($param['yjno'])|| !isset($param['num'])){
|
|
|
$this->success('参数错误');
|
|
|
}
|
|
|
+ $page = $param['page'] ?? 1;
|
|
|
+ $pageSize = $param['pageSize'] ?? 50;
|
|
|
$list = db('制程检验_记录')
|
|
|
->field('工单编号,流程单号,工序名称,班组编号,类别,检验项目,检验结果,检验备注 as 项目备注,相关标准 as 修改标准')
|
|
|
->where('工单编号',$param['gdbh'])
|
|
|
@@ -193,6 +198,7 @@ class ProductionLot extends Api
|
|
|
->where('流程单号',$param['num'])
|
|
|
->where('类别', 'neq', '现场巡查记录')
|
|
|
->order('流程单号')
|
|
|
+ ->page($page,$pageSize)
|
|
|
->select();
|
|
|
$total = count($list);
|
|
|
$data = [
|
|
|
@@ -303,7 +309,7 @@ class ProductionLot extends Api
|
|
|
->where('a.st_gdbh', $param['gdbh'])
|
|
|
->where('a.cpdh', $param['cpdh'] ?? '') // 使用空值合并运算符
|
|
|
->whereNotNull('a.供方批次')
|
|
|
- ->group('a.st_wlbh')
|
|
|
+ ->group('a.st_wlbh,a.供方批次')
|
|
|
->select();
|
|
|
|
|
|
if (empty($list)) {
|
|
|
@@ -398,7 +404,8 @@ class ProductionLot extends Api
|
|
|
|
|
|
$gdbh = $param['gdbh'];
|
|
|
$yjno = $param['yjno'];
|
|
|
-
|
|
|
+ $page = $param['page'] ?? 1;
|
|
|
+ $pageSize = $param['pageSize'] ?? 2;
|
|
|
// 3. 主查询 - 获取印版领用记录
|
|
|
$list = db('工单_印版领用记录')
|
|
|
->alias('a')
|
|
|
@@ -417,8 +424,9 @@ class ProductionLot extends Api
|
|
|
])
|
|
|
->group('a.Yb_存货编码, a.Yb_供方批号') // 明确指定表字段
|
|
|
->order('a.Yb_存货编码')
|
|
|
+ ->page($page,$pageSize)
|
|
|
->select();
|
|
|
-
|
|
|
+
|
|
|
if (empty($list)) {
|
|
|
$this->success('未找到印版数据');
|
|
|
}
|