面料单条记录数据查询

application/api/controller/WorkOrder.php

@@ -1972,7 +1972,7 @@ class WorkOrder extends Api
             ->field('a.BOM_工单编号 as 订单编号,b.生产款号 as 生产款号,b.客户编号 as 客户编号,b.款式 as 款式,
             a.BOM_物料名称 as 物料名称,a.BOM_投料单位 as 投料单位,a.BOM_计划用量 as 计划用料,a.BOM_标准用量 as 定额用料,
             a.BOM_实际用量 as 裁床实际用料,a.BOM_领用数量 as 裁床领用面料,a.BOM_退还数量 as 裁床退回仓库面料,
-            a.BOM_desc as 备注,a.UNIQID')
+            a.BOM_desc as 备注,a.UNIQID,a.BOM_库存总量 as 入库总量,a.BOM_面料结余 as 面料结余,a.Sys_ID as ID,a.Sys_rq as 日期')
             ->where($where)
             ->select();
         if (!empty($list)){
@@ -2038,7 +2038,7 @@ class WorkOrder extends Api
             $list['入库记录'] = \db('设备_报工日志')
                 ->where('order_id|款号',$param['order'])
                 ->where('name','入库')
-                ->field('order_id as 订单编号,款号,number as 数量,rq as 出库时间,sys_id as 上报机台')
+                ->field('order_id as 订单编号,款号,number as 数量,rq as 入库时间,sys_id as 上报机台,recipient as 入仓人员')
                 ->order('出库时间 desc')
                 ->select();
         }else{
@@ -2046,14 +2046,14 @@ class WorkOrder extends Api
             $list['出库记录'] = \db('设备_报工日志')
                 ->where('order_id|款号',$param['order'])
                 ->where('name','出库')
-                ->field('order_id as 订单编号,款号,number as 数量,rq as 出库时间,sys_id as 上报机台')
+                ->field('order_id as 订单编号,款号,number as 数量,rq as 出库时间,sys_id as 上报机台,recipient as 出库人员')
                 ->order('出库时间 desc')
                 ->select();
             //退还记录查询
             $list['退还记录'] = \db('设备_报工日志')
                 ->where('order_id|款号',$param['order'])
                 ->where('name','退还')
-                ->field('order_id as 订单编号,款号,number as 数量,rq as 出库时间,sys_id as 上报机台')
+                ->field('order_id as 订单编号,款号,number as 数量,rq as 退还时间,sys_id as 上报机台,recipient as 退还人员')
                 ->order('出库时间 desc')
                 ->select();
         }
@@ -2160,4 +2160,44 @@ class WorkOrder extends Api
         }
     }
 
+
+    /**
+     * 单条面料详情
+     * @return void
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function oneFabricDetail()
+    {
+        if ($this->request->isGet() === false){
+            $this->error('请求错误');
+        }
+        $param = $this->request->param();
+        if (empty($param)){
+            $this->error('参数错误');
+        }
+        //面料入库记录
+        $list['入库'] = \db('设备_报工日志')
+            ->where('order_id',$param['order'])
+            ->where('物料名称',$param['fabricName'])
+            ->where('name','入库')
+            ->field('order_id as 订单编号,款号,物料名称,number as 数量,rq as 日期,sys_id as 操作机台,recipient as 入仓人员')
+            ->select();
+        //面料出库记录
+        $list['出库'] = \db('设备_报工日志')
+            ->where('order_id',$param['order'])
+            ->where('物料名称',$param['fabricName'])
+            ->where('name','出库')
+            ->field('order_id as 订单编号,款号,物料名称,number as 数量,rq as 日期,sys_id as 操作机台,receipt_number as 出库单据编号,recipient as 领用人员')
+            ->select();
+        //面料退还记录
+        $list['退还'] = \db('设备_报工日志')
+            ->where('order_id',$param['order'])
+            ->where('物料名称',$param['fabricName'])
+            ->where('name','退还')
+            ->field('order_id as 订单编号,款号,物料名称,number as 数量,rq as 日期,sys_id as 操作机台,recipient as 退还人员')
+            ->select();
+        $this->success('成功',$list);
+    }
 }