入库单据查询

application/api/controller/WorkOrder.php

@@ -1613,6 +1613,7 @@ class WorkOrder extends Api
                     $data[] = [
                         'BOM_工单编号' => $list['订单编号'],
                         'BOM_物料名称' => $value,
+                        'BOM_desc' => $massage,
                         'Sys_rq' => date('Y-m-d H:i:s'),
                         'Sys_ID' => '超级管理员'
                     ];
@@ -1672,6 +1673,7 @@ class WorkOrder extends Api
                         $data[] = [
                             'BOM_工单编号' => $list['订单编号'],
                             'BOM_物料名称' => $value,
+                            'BOM_desc' => $massage,
                             'Sys_rq' => date('Y-m-d H:i:s'),
                             'Sys_ID' => '超级管理员'
                         ];
@@ -2083,10 +2085,14 @@ class WorkOrder extends Api
             $this->error('单据编号参数错误');
         }
         $list = \db('设备_报工日志')
-//            ->where('receipt_number','like','%',$param['receipt'].'%')
-            ->where('receipt_number',$param['receipt'])
-            ->field('order_id as 订单编号,款号,物料名称,number as 数量,rq as 日期,sys_id as 操作机台,receipt_number as 出库单据编号,recipient as 领用人员')
-            ->whereNull('Mod_rq')
+            ->alias('a')
+            ->join('工单_面料资料 b','a.order_id = b.BOM_工单编号 AND b.BOM_物料编码 = a.物料编码')
+            ->join('物料_库存 c','a.物料编码 = c.物料编号 AND a.批次号 = c.批次号')
+            ->where('a.receipt_number',$param['receipt'])
+            ->field('a.order_id as 订单编号,a.款号,a.物料名称,a.number as 数量,a.rq as 日期,a.sys_id as 操作机台,
+            a.receipt_number as 出库单据编号,a.recipient as 领用人员,b.BOM_颜色,c.单位,b.BOM_计划门幅 as 计划门幅,
+            b.BOM_定额门幅 as 定额门幅,c.实际门幅,c.状态,c.库存数量,c.入仓总量')
+            ->whereNull('a.Mod_rq')
             ->select();
 
         if (empty($list)){
@@ -2123,7 +2129,7 @@ class WorkOrder extends Api
         $limit = $param['limit'];
         $list = \db('设备_报工日志')
             ->where($where)
-            ->field('receipt_number as 出库单,order_id as 订单编号,款号,物料名称,rq as 日期,sys_id as 操作机台,recipient as 领料人员,name as 单号类型')
+            ->field('receipt_number as 出库单,order_id as 订单编号,款号,物料编码,物料名称,rq as 日期,sys_id as 操作机台,recipient as 领料人员,name as 单号类型,sum(number) as 总数')
             ->group('出库单')
             ->order('rq desc')
             ->where('Mod_rq',null)
@@ -2268,4 +2274,55 @@ class WorkOrder extends Api
             $this->success('成功',$list);
         }
     }
+
+
+    //批量生成工单数据
+//    public function OrderBatch()
+//    {
+//        $param = $this->request->param();
+//        $where = [
+//            'Sys_rq'=>['>', $param['date'].'00:00:00'],
+//            'Mod_rq'=>null
+//        ];
+//        $list = \db('工单_基本资料')
+//            ->where($where)
+//            ->column('订单编号');
+//        foreach ($list as $item){
+//            $orderDetail = \db('工单_基本资料')
+//                ->where('订单编号',$item)
+//                ->where('Mod_rq',null)
+//                ->find();
+//            $BomDetail = \db('工单_bom资料')
+//                ->where('BOM_工单编号',$item)
+//                ->where('Mod_rq',null)
+//                ->select();
+//            $colorList = \db('工单_印件资料')
+//                ->where('订单编号',$item)
+//                ->where('Mod_rq',null)
+//                ->column('DISTINCT(颜色备注) as 颜色');
+//            $data = [];
+//            if (!empty($colorList)){
+//                foreach ($colorList as $key => $value){
+//                    foreach ($BomDetail as $k => $v){
+//                        $farbic = [
+//                            'BOM_工单编号' => $item,
+//                            'BOM_颜色' => $value,
+//                            'BOM_物料编码' => $orderDetail['生产款号'].'-'.$value.($key+1),
+//                            'BOM_物料名称' => $v['BOM_物料名称'],
+//                            'BOM_标准用量' => $v['BOM_标准用量'],
+//                            'BOM_计划用量' => $v['BOM_计划用量'],
+//                            'BOM_计划门幅' => $v['BOM_计划门幅'],
+//                            'BOM_定额门幅' => $v['BOM_定额门幅'],
+//                            'BOM_投料单位' => '米',
+//                            'Sys_ID' => '超级管理员',
+//                            'Sys_rq' => date('Y-m-d H:i:s',time()),
+//                            'BOM_desc' => empty($orderDetail['粘衬']) || $orderDetail['粘衬'] == '无' ? $orderDetail['面料'] : $orderDetail['面料'] . '，粘衬：' . $orderDetail['粘衬']
+//                        ];
+//                        array_push($data,$farbic);
+//                    }
+//                }
+//
+//            }
+//        }
+//    }
 }