关联订单获取

application/api/controller/WorkOrder.php

@@ -1384,12 +1384,6 @@ class WorkOrder extends Api
         if (empty($param)){
             $this->error('参数错误');
         }
-//        $id = $param['id'];
-//        unset($param['id']);
-
-//        $findlist = \db('工单_印件资料')
-//            ->where('Uniqid', $param['id'])
-//            ->find();
 
         $updata = [
             '订单编号' => $param['订单编号'],
@@ -1404,22 +1398,6 @@ class WorkOrder extends Api
         for ($i = 1; $i <= 10; $i++) {
             $updata["cmsl{$i}"] = isset($param["cmsl{$i}"]) ? $param["cmsl{$i}"] : '';
         }
-        //获取子订单颜色编号
-//        $color_id = \db('工单_印件资料')
-//            ->where('Uniqid',$param['id'])
-//            ->field('color_id')
-//            ->find();
-//        if ($color_id['color_id'] !== $param['color_id']){
-//
-//        }
-//        $FabricData = ['BOM_颜色'=>$color_id['color_id']];
-        //修改面料颜色
-//        $FabricSql = \db('工单_面料资料')
-//            ->where('BOM_工单编号',$param['订单编号'])
-//            ->where('BOM_颜色',$color_id['color_id'])
-//            ->fetchSql(true)
-//            ->update($FabricData);
-//        \db()->query($FabricSql);
         $sql = \db('工单_印件资料')
             ->where('Uniqid', $param['id'])
             ->fetchSql(true)
@@ -1503,8 +1481,8 @@ class WorkOrder extends Api
             ->join('工单_基本资料 b','b.订单编号 = a.BOM_工单编号')
             ->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_库存总量 as 入库总量, a.BOM_计划门幅 as 计划门幅, a.BOM_定额门幅 as 定额门幅,a.BOM_面料结余 as 面料结余,a.Sys_ID as ID,a.Sys_rq as 日期')
+            a.BOM_实际用量 as 裁床实际用料,a.BOM_desc as 备注,a.UNIQID,
+            a.BOM_计划门幅 as 计划门幅, a.BOM_定额门幅 as 定额门幅,a.Sys_ID as ID,a.Sys_rq as 日期')
             ->where($where)
             ->whereNull('a.Mod_rq')
             ->select();
@@ -2038,7 +2016,7 @@ class WorkOrder extends Api
 
         // 分页参数，防止未传递时出错
         $page = isset($param['page']) ? (int)$param['page'] : 1;
-        $limit = isset($param['limit']) ? (int)$param['limit'] : 20;  // 默认每页20条数据
+        $limit = isset($param['limit']) ? (int)$param['limit'] : 50;  // 默认每页20条数据
 
         // 获取数据
         $data = \db('工单_面料资料')
@@ -2048,7 +2026,7 @@ class WorkOrder extends Api
             a.BOM_物料编码,a.BOM_物料名称 as 物料名称, a.BOM_投料单位 as 投料单位,
             a.BOM_实际用量 as 裁床实际用料, a.BOM_领用数量 as 裁床领用面料, a.BOM_退还数量 as 裁床退回仓库面料,
             a.BOM_desc as 备注, a.UNIQID, a.BOM_库存总量 as 入库总量, a.BOM_计划门幅 as 计划门幅, a.BOM_定额门幅 as 定额门幅, 
-            a.BOM_面料结余 as 面料结余, a.Sys_ID as ID, a.Sys_rq as 日期,a.BOM_关联工单')
+            a.BOM_面料结余 as 面料结余, a.Sys_ID as ID, a.Sys_rq as 日期')
             ->where($where)
             ->order("a.BOM_工单编号 desc")
             ->limit(($page - 1) * $limit, $limit)