|
|
@@ -1006,73 +1006,13 @@ class WorkOrderSpotCheck extends Api{
|
|
|
'颜色' => $yinjianlist['颜色备注'],
|
|
|
];
|
|
|
|
|
|
-
|
|
|
-// // 查询历史记录
|
|
|
-// $existingRecords = \db('设备_产量计酬')->alias('c')
|
|
|
-// ->field('
|
|
|
-// c.订单编号, c.子订单编号, c.款号, c.工序编号, c.工序名称, c.尺码, c.数量, c.sczl_jtbh,
|
|
|
-// c.尾包,c.UniqId,c.ci_num,c.s_num,c.sys_rq, c.serial,
|
|
|
-// j.款式,
|
|
|
-// y.zdtotal, y.sctotal, y.颜色,y.颜色备注
|
|
|
-// ')
|
|
|
-// ->join('工单_印件资料 y', 'c.子订单编号 = y.子订单编号', 'left')
|
|
|
-// ->join('工单_基本资料 j', 'c.订单编号 = j.订单编号', 'left')
|
|
|
-// ->where('c.子订单编号', $paramArray[0])
|
|
|
-// ->where('c.工序名称', $gongxuname)
|
|
|
-// ->where('c.sczl_jtbh', $params['sys_sbID'])
|
|
|
-// ->whereNull('c.mod_rq') // 查询未删除数据
|
|
|
-// ->where(function($query) {
|
|
|
-// $query->whereNotNull('y.ck_rq')->where('y.ck_rq', '<>', '');
|
|
|
-// }) // 查询出库数据
|
|
|
-// ->order('c.UniqId', 'desc')
|
|
|
-// ->distinct('c.子订单编号')
|
|
|
-// ->select();
|
|
|
-// $sizeSummary = [];
|
|
|
-// $sizes = [];
|
|
|
-// foreach ($existingRecords as $record) {
|
|
|
-// $size = $record['尺码'];
|
|
|
-// $quantity = $record['数量'];
|
|
|
-// $serial = $record['serial'];
|
|
|
-// // 如果尺码还没有出现过，加入尺码列表
|
|
|
-// if (!in_array($size, $sizes)) {
|
|
|
-// $sizes[] = $size;
|
|
|
-// }
|
|
|
-// if (!isset($sizeSummary[$record['UniqId']])) {
|
|
|
-// $sizeSummary[$record['UniqId']] = [
|
|
|
-// 'UniqId' => $record['UniqId'],
|
|
|
-// '订单编号' => $record['订单编号'],
|
|
|
-// '子订单编号' => $record['子订单编号'],
|
|
|
-// '上报数量' => $record['s_num'],
|
|
|
-// '剩余数量' => $record['ci_num'],
|
|
|
-// '次品数量' => $record['数量'] - $record['ci_num'],
|
|
|
-// '生产款号' => $record['款号'],
|
|
|
-// '尺码' => $record['尺码'],
|
|
|
-// '工序编号' => $record['工序编号'],
|
|
|
-// '工序名称' => $record['工序名称'],
|
|
|
-// '数量' => $quantity,
|
|
|
-// '尾包' => $record['尾包'] == 1 ? '是' : '否',
|
|
|
-// '颜色' => $record['颜色备注'],
|
|
|
-// '组别' => $record['sczl_jtbh'],
|
|
|
-// '款式' => $record['款式'],
|
|
|
-// 'serial' => '第('.$serial.')包',
|
|
|
-// 'sys_rq' => $record['sys_rq']
|
|
|
-// ];
|
|
|
-// }
|
|
|
-// }
|
|
|
-// // 将 $sizeSummary 转换为索引数组
|
|
|
-// $sizeSummary = array_values($sizeSummary);
|
|
|
-// // 对 $sizeSummary 按 sys_rq 降序排序
|
|
|
-// usort($sizeSummary, function ($a, $b) {
|
|
|
-// return strtotime($b['UniqId']) - strtotime($a['UniqId']);
|
|
|
-// });
|
|
|
-
|
|
|
$ddorder = explode('-', $paramArray[0]);
|
|
|
$clwhere['sczl_jtbh'] = $params['sys_sbID'];
|
|
|
$clwhere['订单编号'] = $ddorder[0];
|
|
|
$clwhere['工序名称'] = $gongxuname;
|
|
|
$clwhere['mod_rq'] = null;
|
|
|
$cljclist = \db('设备_产量计酬')
|
|
|
- ->field('订单编号,子订单编号,尺码,数量,mod_rq')
|
|
|
+ ->field('订单编号,子订单编号,尺码,s_num as 数量,mod_rq')
|
|
|
->where($clwhere)
|
|
|
->select();
|
|
|
$result = [];
|
|
|
@@ -1113,7 +1053,7 @@ class WorkOrderSpotCheck extends Api{
|
|
|
// 查询历史记录
|
|
|
$res = \db('设备_产量计酬')->alias('c')
|
|
|
->field('
|
|
|
- c.订单编号, c.子订单编号, c.款号, c.工序编号, c.工序名称, c.尺码, c.数量, c.sczl_jtbh,
|
|
|
+ c.订单编号, c.子订单编号, c.款号, c.工序编号, c.工序名称, c.尺码, c.s_num as 数量, c.sczl_jtbh,
|
|
|
c.尾包,c.UniqId,c.ci_num,c.s_num,c.sys_rq, c.serial,
|
|
|
j.款式,
|
|
|
y.zdtotal, y.sctotal, y.颜色,y.颜色备注
|
|
|
@@ -1338,73 +1278,13 @@ class WorkOrderSpotCheck extends Api{
|
|
|
'颜色' => $yinjianlist['颜色备注'],
|
|
|
];
|
|
|
|
|
|
-
|
|
|
-// // 查询历史记录
|
|
|
-// $existingRecords = \db('设备_产量计酬')->alias('c')
|
|
|
-// ->field('
|
|
|
-// c.订单编号, c.子订单编号, c.款号, c.工序编号, c.工序名称, c.尺码, c.数量, c.sczl_jtbh,
|
|
|
-// c.尾包,c.UniqId,c.ci_num,c.s_num,c.sys_rq, c.serial,
|
|
|
-// j.款式,
|
|
|
-// y.zdtotal, y.sctotal, y.颜色,y.颜色备注
|
|
|
-// ')
|
|
|
-// ->join('工单_印件资料 y', 'c.子订单编号 = y.子订单编号', 'left')
|
|
|
-// ->join('工单_基本资料 j', 'c.订单编号 = j.订单编号', 'left')
|
|
|
-// ->where('c.子订单编号', $paramArray[0])
|
|
|
-// ->where('c.工序名称', $gongxuname)
|
|
|
-// ->where('c.sczl_jtbh', $params['sys_sbID'])
|
|
|
-// ->whereNull('c.mod_rq') // 查询未删除数据
|
|
|
-// ->where(function($query) {
|
|
|
-// $query->whereNotNull('y.ck_rq')->where('y.ck_rq', '<>', '');
|
|
|
-// }) // 查询出库数据
|
|
|
-// ->order('c.UniqId', 'desc')
|
|
|
-// ->distinct('c.子订单编号')
|
|
|
-// ->select();
|
|
|
-// $sizeSummary = [];
|
|
|
-// $sizes = [];
|
|
|
-// foreach ($existingRecords as $record) {
|
|
|
-// $size = $record['尺码'];
|
|
|
-// $quantity = $record['数量'];
|
|
|
-// $serial = $record['serial'];
|
|
|
-// // 如果尺码还没有出现过，加入尺码列表
|
|
|
-// if (!in_array($size, $sizes)) {
|
|
|
-// $sizes[] = $size;
|
|
|
-// }
|
|
|
-// if (!isset($sizeSummary[$record['UniqId']])) {
|
|
|
-// $sizeSummary[$record['UniqId']] = [
|
|
|
-// 'UniqId' => $record['UniqId'],
|
|
|
-// '订单编号' => $record['订单编号'],
|
|
|
-// '子订单编号' => $record['子订单编号'],
|
|
|
-// '上报数量' => $record['s_num'],
|
|
|
-// '剩余数量' => $record['ci_num'],
|
|
|
-// '次品数量' => $record['数量'] - $record['ci_num'],
|
|
|
-// '生产款号' => $record['款号'],
|
|
|
-// '尺码' => $record['尺码'],
|
|
|
-// '工序编号' => $record['工序编号'],
|
|
|
-// '工序名称' => $record['工序名称'],
|
|
|
-// '数量' => $quantity,
|
|
|
-// '尾包' => $record['尾包'] == 1 ? '是' : '否',
|
|
|
-// '颜色' => $record['颜色备注'],
|
|
|
-// '组别' => $record['sczl_jtbh'],
|
|
|
-// '款式' => $record['款式'],
|
|
|
-// 'serial' => '第('.$serial.')包',
|
|
|
-// 'sys_rq' => $record['sys_rq']
|
|
|
-// ];
|
|
|
-// }
|
|
|
-// }
|
|
|
-// // 将 $sizeSummary 转换为索引数组
|
|
|
-// $sizeSummary = array_values($sizeSummary);
|
|
|
-// // 对 $sizeSummary 按 sys_rq 降序排序
|
|
|
-// usort($sizeSummary, function ($a, $b) {
|
|
|
-// return strtotime($b['UniqId']) - strtotime($a['UniqId']);
|
|
|
-// });
|
|
|
-
|
|
|
$ddorder = explode('-', $paramArray[0]);
|
|
|
$clwhere['sczl_jtbh'] = $params['sys_sbID'];
|
|
|
$clwhere['订单编号'] = $ddorder[0];
|
|
|
$clwhere['工序名称'] = $gongxuname;
|
|
|
$clwhere['mod_rq'] = null;
|
|
|
$cljclist = \db('设备_产量计酬')
|
|
|
- ->field('订单编号,子订单编号,尺码,数量,mod_rq')
|
|
|
+ ->field('订单编号,子订单编号,尺码,s_num as 数量,mod_rq')
|
|
|
->where($clwhere)
|
|
|
->select();
|
|
|
$result = [];
|
|
|
@@ -1445,7 +1325,7 @@ class WorkOrderSpotCheck extends Api{
|
|
|
// 查询历史记录
|
|
|
$res = \db('设备_产量计酬')->alias('c')
|
|
|
->field('
|
|
|
- c.订单编号, c.子订单编号, c.款号, c.工序编号, c.工序名称, c.尺码, c.数量, c.sczl_jtbh,
|
|
|
+ c.订单编号, c.子订单编号, c.款号, c.工序编号, c.工序名称, c.尺码, c.s_num as 数量, c.sczl_jtbh,
|
|
|
c.尾包,c.UniqId,c.ci_num,c.s_num,c.sys_rq, c.serial,
|
|
|
j.款式,
|
|
|
y.zdtotal, y.sctotal, y.颜色,y.颜色备注
|
|
|
@@ -1669,74 +1549,13 @@ class WorkOrderSpotCheck extends Api{
|
|
|
'zdtotal' => $yinjianlist['zdtotal'],
|
|
|
'颜色' => $yinjianlist['颜色备注'],
|
|
|
];
|
|
|
-
|
|
|
-
|
|
|
-// // 查询历史记录
|
|
|
-// $existingRecords = \db('设备_产量计酬')->alias('c')
|
|
|
-// ->field('
|
|
|
-// c.订单编号, c.子订单编号, c.款号, c.工序编号, c.工序名称, c.尺码, c.数量, c.sczl_jtbh,
|
|
|
-// c.尾包,c.UniqId,c.ci_num,c.s_num,c.sys_rq, c.serial,
|
|
|
-// j.款式,
|
|
|
-// y.zdtotal, y.sctotal, y.颜色,y.颜色备注
|
|
|
-// ')
|
|
|
-// ->join('工单_印件资料 y', 'c.子订单编号 = y.子订单编号', 'left')
|
|
|
-// ->join('工单_基本资料 j', 'c.订单编号 = j.订单编号', 'left')
|
|
|
-// ->where('c.子订单编号', $paramArray[0])
|
|
|
-// ->where('c.工序名称', $gongxuname)
|
|
|
-// ->where('c.sczl_jtbh', $params['sys_sbID'])
|
|
|
-// ->whereNull('c.mod_rq') // 查询未删除数据
|
|
|
-// ->where(function($query) {
|
|
|
-// $query->whereNotNull('y.ck_rq')->where('y.ck_rq', '<>', '');
|
|
|
-// }) // 查询出库数据
|
|
|
-// ->order('c.UniqId', 'desc')
|
|
|
-// ->distinct('c.子订单编号')
|
|
|
-// ->select();
|
|
|
-// $sizeSummary = [];
|
|
|
-// $sizes = [];
|
|
|
-// foreach ($existingRecords as $record) {
|
|
|
-// $size = $record['尺码'];
|
|
|
-// $quantity = $record['数量'];
|
|
|
-// $serial = $record['serial'];
|
|
|
-// // 如果尺码还没有出现过，加入尺码列表
|
|
|
-// if (!in_array($size, $sizes)) {
|
|
|
-// $sizes[] = $size;
|
|
|
-// }
|
|
|
-// if (!isset($sizeSummary[$record['UniqId']])) {
|
|
|
-// $sizeSummary[$record['UniqId']] = [
|
|
|
-// 'UniqId' => $record['UniqId'],
|
|
|
-// '订单编号' => $record['订单编号'],
|
|
|
-// '子订单编号' => $record['子订单编号'],
|
|
|
-// '上报数量' => $record['s_num'],
|
|
|
-// '剩余数量' => $record['ci_num'],
|
|
|
-// '次品数量' => $record['数量'] - $record['ci_num'],
|
|
|
-// '生产款号' => $record['款号'],
|
|
|
-// '尺码' => $record['尺码'],
|
|
|
-// '工序编号' => $record['工序编号'],
|
|
|
-// '工序名称' => $record['工序名称'],
|
|
|
-// '数量' => $quantity,
|
|
|
-// '尾包' => $record['尾包'] == 1 ? '是' : '否',
|
|
|
-// '颜色' => $record['颜色备注'],
|
|
|
-// '组别' => $record['sczl_jtbh'],
|
|
|
-// '款式' => $record['款式'],
|
|
|
-// 'serial' => '第('.$serial.')包',
|
|
|
-// 'sys_rq' => $record['sys_rq']
|
|
|
-// ];
|
|
|
-// }
|
|
|
-// }
|
|
|
-// // 将 $sizeSummary 转换为索引数组
|
|
|
-// $sizeSummary = array_values($sizeSummary);
|
|
|
-// // 对 $sizeSummary 按 sys_rq 降序排序
|
|
|
-// usort($sizeSummary, function ($a, $b) {
|
|
|
-// return strtotime($b['UniqId']) - strtotime($a['UniqId']);
|
|
|
-// });
|
|
|
-
|
|
|
$ddorder = explode('-', $paramArray[0]);
|
|
|
$clwhere['sczl_jtbh'] = $params['sys_sbID'];
|
|
|
$clwhere['订单编号'] = $ddorder[0];
|
|
|
$clwhere['工序名称'] = $gongxuname;
|
|
|
$clwhere['mod_rq'] = null;
|
|
|
$cljclist = \db('设备_产量计酬')
|
|
|
- ->field('订单编号,子订单编号,尺码,数量,mod_rq')
|
|
|
+ ->field('订单编号,子订单编号,尺码,s_num as 数量,mod_rq')
|
|
|
->where($clwhere)
|
|
|
->select();
|
|
|
$result = [];
|
|
|
@@ -1777,7 +1596,7 @@ class WorkOrderSpotCheck extends Api{
|
|
|
// 查询历史记录
|
|
|
$res = \db('设备_产量计酬')->alias('c')
|
|
|
->field('
|
|
|
- c.订单编号, c.子订单编号, c.款号, c.工序编号, c.工序名称, c.尺码, c.数量, c.sczl_jtbh,
|
|
|
+ c.订单编号, c.子订单编号, c.款号, c.工序编号, c.工序名称, c.尺码, c.s_num as 数量, c.sczl_jtbh,
|
|
|
c.尾包,c.UniqId,c.ci_num,c.s_num,c.sys_rq, c.serial,
|
|
|
j.款式,
|
|
|
y.zdtotal, y.sctotal, y.颜色,y.颜色备注
|
|
|
@@ -2002,73 +1821,13 @@ class WorkOrderSpotCheck extends Api{
|
|
|
'颜色' => $yinjianlist['颜色备注'],
|
|
|
];
|
|
|
|
|
|
-
|
|
|
-// // 查询历史记录
|
|
|
-// $existingRecords = \db('设备_产量计酬')->alias('c')
|
|
|
-// ->field('
|
|
|
-// c.订单编号, c.子订单编号, c.款号, c.工序编号, c.工序名称, c.尺码, c.数量, c.sczl_jtbh,
|
|
|
-// c.尾包,c.UniqId,c.ci_num,c.s_num,c.sys_rq, c.serial,
|
|
|
-// j.款式,
|
|
|
-// y.zdtotal, y.sctotal, y.颜色,y.颜色备注
|
|
|
-// ')
|
|
|
-// ->join('工单_印件资料 y', 'c.子订单编号 = y.子订单编号', 'left')
|
|
|
-// ->join('工单_基本资料 j', 'c.订单编号 = j.订单编号', 'left')
|
|
|
-// ->where('c.子订单编号', $paramArray[0])
|
|
|
-// ->where('c.工序名称', $gongxuname)
|
|
|
-// ->where('c.sczl_jtbh', $params['sys_sbID'])
|
|
|
-// ->whereNull('c.mod_rq') // 查询未删除数据
|
|
|
-// ->where(function($query) {
|
|
|
-// $query->whereNotNull('y.ck_rq')->where('y.ck_rq', '<>', '');
|
|
|
-// }) // 查询出库数据
|
|
|
-// ->order('c.UniqId', 'desc')
|
|
|
-// ->distinct('c.子订单编号')
|
|
|
-// ->select();
|
|
|
-// $sizeSummary = [];
|
|
|
-// $sizes = [];
|
|
|
-// foreach ($existingRecords as $record) {
|
|
|
-// $size = $record['尺码'];
|
|
|
-// $quantity = $record['数量'];
|
|
|
-// $serial = $record['serial'];
|
|
|
-// // 如果尺码还没有出现过，加入尺码列表
|
|
|
-// if (!in_array($size, $sizes)) {
|
|
|
-// $sizes[] = $size;
|
|
|
-// }
|
|
|
-// if (!isset($sizeSummary[$record['UniqId']])) {
|
|
|
-// $sizeSummary[$record['UniqId']] = [
|
|
|
-// 'UniqId' => $record['UniqId'],
|
|
|
-// '订单编号' => $record['订单编号'],
|
|
|
-// '子订单编号' => $record['子订单编号'],
|
|
|
-// '上报数量' => $record['s_num'],
|
|
|
-// '剩余数量' => $record['ci_num'],
|
|
|
-// '次品数量' => $record['数量'] - $record['ci_num'],
|
|
|
-// '生产款号' => $record['款号'],
|
|
|
-// '尺码' => $record['尺码'],
|
|
|
-// '工序编号' => $record['工序编号'],
|
|
|
-// '工序名称' => $record['工序名称'],
|
|
|
-// '数量' => $quantity,
|
|
|
-// '尾包' => $record['尾包'] == 1 ? '是' : '否',
|
|
|
-// '颜色' => $record['颜色备注'],
|
|
|
-// '组别' => $record['sczl_jtbh'],
|
|
|
-// '款式' => $record['款式'],
|
|
|
-// 'serial' => '第('.$serial.')包',
|
|
|
-// 'sys_rq' => $record['sys_rq']
|
|
|
-// ];
|
|
|
-// }
|
|
|
-// }
|
|
|
-// // 将 $sizeSummary 转换为索引数组
|
|
|
-// $sizeSummary = array_values($sizeSummary);
|
|
|
-// // 对 $sizeSummary 按 sys_rq 降序排序
|
|
|
-// usort($sizeSummary, function ($a, $b) {
|
|
|
-// return strtotime($b['UniqId']) - strtotime($a['UniqId']);
|
|
|
-// });
|
|
|
-
|
|
|
$ddorder = explode('-', $paramArray[0]);
|
|
|
$clwhere['sczl_jtbh'] = $params['sys_sbID'];
|
|
|
$clwhere['订单编号'] = $ddorder[0];
|
|
|
$clwhere['工序名称'] = $gongxuname;
|
|
|
$clwhere['mod_rq'] = null;
|
|
|
$cljclist = \db('设备_产量计酬')
|
|
|
- ->field('订单编号,子订单编号,尺码,数量,mod_rq')
|
|
|
+ ->field('订单编号,子订单编号,尺码,s_num as 数量,mod_rq')
|
|
|
->where($clwhere)
|
|
|
->select();
|
|
|
$result = [];
|
|
|
@@ -2109,7 +1868,7 @@ class WorkOrderSpotCheck extends Api{
|
|
|
// 查询历史记录
|
|
|
$res = \db('设备_产量计酬')->alias('c')
|
|
|
->field('
|
|
|
- c.订单编号, c.子订单编号, c.款号, c.工序编号, c.工序名称, c.尺码, c.数量, c.sczl_jtbh,
|
|
|
+ c.订单编号, c.子订单编号, c.款号, c.工序编号, c.工序名称, c.尺码, c.s_num as 数量, c.sczl_jtbh,
|
|
|
c.尾包,c.UniqId,c.ci_num,c.s_num,c.sys_rq, c.serial,
|
|
|
j.款式,
|
|
|
y.zdtotal, y.sctotal, y.颜色,y.颜色备注
|
