|
|
@@ -1059,14 +1059,13 @@ class Manufacture extends Api
|
|
|
->group('a.订单编号,a.工序名称')
|
|
|
->order('c.Uniqid')
|
|
|
->select();
|
|
|
- $orderList = \db('设备_产量计酬')
|
|
|
+ $orderList = \db('工单_印件资料')
|
|
|
->alias('a')
|
|
|
->join('工单_基本资料 b','a.订单编号 = b.订单编号')
|
|
|
- ->join('工单_印件资料 c','a.订单编号 = c.订单编号 AND a.子订单编号 = c.子订单编号')
|
|
|
- ->field('c.订单编号,c.子订单编号,c.款号,c.颜色,c.zdtotal as 制单总数,c.sctotal as 裁切总数,c.ck_rq as 出库日期')
|
|
|
+ ->field('a.订单编号,a.子订单编号,a.款号,a.颜色,a.zdtotal as 制单总数,a.sctotal as 裁切总数,a.ck_rq as 出库日期')
|
|
|
->where($where)
|
|
|
->group('a.子订单编号')
|
|
|
- ->order('c.Uniqid')
|
|
|
+ ->order('a.Uniqid')
|
|
|
->select();
|
|
|
$data=[];
|
|
|
foreach ($orderList as $key=>$value){
|
