first commit

application/api/controller/Manufacture.php

@@ -1215,18 +1215,23 @@ class Manufacture extends Api
         }
 
         // 查询数据
+        $offset = ($param['page'] - 1) * $param['limit'];
         $list = \db('设备_产量计酬')->alias('a')
             ->join('工单_印件资料 b', 'b.订单编号 = a.订单编号 AND a.子订单编号 = a.子订单编号')
             ->join('工单_基本资料 j', 'b.订单编号 = j.订单编号', 'LEFT')
             ->field('
                 a.工序名称,a.sczl_bh,b.订单编号, b.子订单编号, b.款号, b.颜色, b.船样, a.尺码, b.zdtotal as 制单数, b.颜色备注,
-                a.数量, MIN(a.sys_rq) as 上报时间, a.UniqId,
+                CASE 
+                    WHEN a.工序名称 IN ("裁剪", "车缝") THEN a.数量
+                    ELSE a.s_num 
+                END as 数量,
+                MIN(a.sys_rq) as 上报时间, a.UniqId,
                 j.客户编号, j.生产款号, j.款式
             ')
             ->where($where)
             ->where('a.mod_rq', null)
             ->order('a.sys_rq desc, a.UniqId desc')
-            ->limit($param['page'],$param['limit'])
+            ->limit($offset, $param['limit'])
             ->group('a.UniqId')
             ->select();
 
@@ -1432,124 +1437,140 @@ class Manufacture extends Api
 
 
     /**
-     * 订单未审核列表
-     * @return void
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
+     * 订单状态及样衣批核
      */
     public function UnapprovalList()
     {
-        if ($this->request->isGet() === false){
+        if ($this->request->isGet() === false) {
             $this->error('请求错误');
         }
+
         $param = $this->request->param();
-        if (isset($param)){
-            $where['订单编号|生产款号'] = ['like','%'.$param['search'].'%'];
-        }
-        $page = $param['page'];
-        $limit = $param['limit'];
-        $where['Mod_rq'] = null;
+
+//        // 参数为空时返回错误
+//        if (empty($param['search'])) {
+//            $this->error('搜索关键词不能为空');
+//        }
+
+        // 设置查询条件
+        $where = [
+            'Mod_rq' => null,
+            '订单编号|生产款号' => ['like', '%' . $param['search'] . '%'],
+        ];
+
+        $page = isset($param['page']) ? $param['page'] : 1;
+        $limit = isset($param['limit']) ? $param['limit'] : 20;
+
+        // 获取工单列表
         $list = \db('工单_基本资料')
             ->where($where)
             ->orderRaw("FIELD(gd_statu, '1-计划中', '2-生产中')")
             ->order('订单编号 desc')
-            ->limit(($page-1)*$limit,$limit)
+            ->limit(($page - 1) * $limit, $limit)
             ->select();
 
+        // 获取总记录数
         $count = \db('工单_基本资料')
             ->where($where)
-            ->orderRaw("FIELD(gd_statu, '1-计划中', '2-生产中')")
-            ->order('订单编号 desc')
-            ->select();
+            ->count();  // 使用 count() 方法优化
 
         // 提取所有订单编号
         $orderIds = array_column($list, '订单编号');
-        // 查询相关附件中是否存在这些订单编号
+
+        // 合并查询相关附件
         $relatedOrders = \db('工单_相关附件')
             ->whereIn('关联编号', $orderIds)
-            ->whereIn('附件备注', '技术附件')
-            ->column('关联编号');
-        $orderAttachments = \db('工单_相关附件')
-            ->whereIn('关联编号', $orderIds)
-            ->whereIn('附件备注', '订单资料附件')
-            ->column('关联编号');
-        // 遍历数据，为每个订单设置 status，并替换字段名
+            ->whereIn('附件备注', ['技术附件', '订单资料附件'])
+            ->column('关联编号,附件备注');
+
+        // 重新组织附件数据
+        $groupedRelatedOrders = [
+            'technical' => [],
+            'order' => []
+        ];
+
+        foreach ($relatedOrders as $orderNumber => $attachmentRemark) {
+            if ($attachmentRemark === '技术附件') {
+                $groupedRelatedOrders['technical'][] = $orderNumber;
+            } elseif ($attachmentRemark === '订单资料附件') {
+                $groupedRelatedOrders['order'][] = $orderNumber;
+            }
+        }
+
+        // 遍历工单列表并设置状态
         foreach ($list as &$value) {
             // 设置订单状态
-            if (in_array($value['订单编号'], $relatedOrders)) {
-                $value['status'] = '';
-            } else {
-                $value['status'] = '*';
-            }
-            if (in_array($value['订单编号'], $orderAttachments)) {
-                $value['orderstatus'] = '';
-            } else {
-                $value['orderstatus'] = '*';
-            }
-            // 将「工单入仓数量」字段替换为「工单完工数量」
-            if (isset($value['工单入仓数量'])) {
-                $value['工单完工数量'] = $value['工单入仓数量'];
-                unset($value['工单入仓数量']);
-            }
+            $value['status'] = in_array($value['订单编号'], $groupedRelatedOrders['technical']) ? '' : '*';
+            $value['orderstatus'] = in_array($value['订单编号'], $groupedRelatedOrders['order']) ? '' : '*';
+
+            // 查询 设备_产量计酬表，统计 s_num 总和
+            $s_num_sum = \db('设备_产量计酬')
+                ->where('订单编号', $value['订单编号'])
+                ->where('工序编号', 7)
+                ->sum('s_num');  // 获取s_num的总和
+
+            // 将 s_num 总和赋值给 工单完工数量
+            $value['工单完工数量'] = $s_num_sum;
         }
-        $data['total'] = count($count);
-        $data['table'] = $list;
-        $this->success('成功',$data);
+
+        // 返回数据
+        $data = [
+            'total' => $count,
+            'table' => $list,
+        ];
+
+        $this->success('成功', $data);
     }
 
+
 //    public function UnapprovalList()
 //    {
 //        if ($this->request->isGet() === false){
 //            $this->error('请求错误');
 //        }
-//
 //        $param = $this->request->param();
 //        if (isset($param)){
 //            $where['订单编号|生产款号'] = ['like','%'.$param['search'].'%'];
 //        }
-//
-//        // 其他条件
+//        $page = $param['page'];
+//        $limit = $param['limit'];
 //        $where['Mod_rq'] = null;
-//
-//        // 查询工单基本资料
 //        $list = \db('工单_基本资料')
 //            ->where($where)
 //            ->orderRaw("FIELD(gd_statu, '1-计划中', '2-生产中')")
 //            ->order('订单编号 desc')
+//            ->limit(($page-1)*$limit,$limit)
+//            ->select();
+//
+//        $count = \db('工单_基本资料')
+//            ->where($where)
+//            ->orderRaw("FIELD(gd_statu, '1-计划中', '2-生产中')")
+//            ->order('订单编号 desc')
 //            ->select();
 //
 //        // 提取所有订单编号
 //        $orderIds = array_column($list, '订单编号');
-//
-//        // 查询相关附件（技术附件和订单附件）
+//        // 查询相关附件中是否存在这些订单编号
 //        $relatedOrders = \db('工单_相关附件')
 //            ->whereIn('关联编号', $orderIds)
-//            ->whereIn('附件备注', ['技术附件', '订单资料附件'])  // 查询技术附件和订单附件
-//            ->select();
-//
-//        $techAttachments = [];  // 存储技术附件的订单编号
-//        $orderAttachments = [];  // 存储订单附件的订单编号
-//        foreach ($relatedOrders as $attachment) {
-//            if ($attachment['附件备注'] == '技术附件') {
-//                $techAttachments[] = $attachment['关联编号'];
-//            } elseif ($attachment['附件备注'] == '订单资料附件') {
-//                $orderAttachments[] = $attachment['关联编号'];
-//            }
-//        }
-//        // 遍历工单基本资料，设置相应的状态
+//            ->whereIn('附件备注', '技术附件')
+//            ->column('关联编号');
+//        $orderAttachments = \db('工单_相关附件')
+//            ->whereIn('关联编号', $orderIds)
+//            ->whereIn('附件备注', '订单资料附件')
+//            ->column('关联编号');
+//        // 遍历数据，为每个订单设置 status，并替换字段名
 //        foreach ($list as &$value) {
-//            // 判断是否是技术附件相关的订单
-//            if (in_array($value['订单编号'], $techAttachments)) {
-//                $value['status'] = '';  // 技术附件的状态为空
+//            // 设置订单状态
+//            if (in_array($value['订单编号'], $relatedOrders)) {
+//                $value['status'] = '';
 //            } else {
-//                $value['status'] = '*';  // 没有技术附件的订单状态为 *
+//                $value['status'] = '*';
 //            }
-//            // 判断是否是订单附件相关的订单
 //            if (in_array($value['订单编号'], $orderAttachments)) {
-//                $value['orderstatus'] = '';  // 订单附件的状态为空
+//                $value['orderstatus'] = '';
 //            } else {
-//                $value['orderstatus'] = '*';  // 没有订单附件的订单状态为 *
+//                $value['orderstatus'] = '*';
 //            }
 //            // 将「工单入仓数量」字段替换为「工单完工数量」
 //            if (isset($value['工单入仓数量'])) {
@@ -1557,14 +1578,11 @@ class Manufacture extends Api
 //                unset($value['工单入仓数量']);
 //            }
 //        }
-//
-//        // 返回成功的结果
-//        $data['total'] = count($list);
+//        $data['total'] = count($count);
 //        $data['table'] = $list;
-//        $this->success('成功', $data);
+//        $this->success('成功',$data);
 //    }
 
-
     /**
      * 月度客户订单汇总
      */

application/api/controller/WorkOrder.php

@@ -853,49 +853,61 @@ class WorkOrder extends Api
         if (empty($param)){
             $this->error('参数错误');
         }
+
         $param['Sys_rq'] = date('Y-m-d H:i:s');
         $param['gd_statu'] = '1-计划中';
 
-        $prefix = substr($param['订单编号'], 0, 2);  // e.g., "DC"
-        $maxOrder = \db('工单_基本资料')
-            ->where('订单编号', 'like', "{$prefix}%")
-            ->order('订单编号', 'desc')
-            ->limit(1)
-            ->value('订单编号');
-
-        if ($maxOrder) {
-            $numericPart = substr($maxOrder, 2);
-            $newNumericPart = str_pad((int)$numericPart + 1, strlen($numericPart), '0', STR_PAD_LEFT);
-            $param['订单编号'] = $prefix . $newNumericPart;
-        } else {
-            $param['订单编号'] = $param['订单编号'];
-        }
-        $massage = $param['面料'].'，粘衬：'.$param['粘衬'];
-        $mianliao = $this->Gpt($massage);
-        $data = [];
-        foreach ($mianliao as $key => $value){
-            $data[$key] = [
-                'BOM_工单编号' => $param['订单编号'],
-                'BOM_物料名称' => $value,
-                'Sys_rq' => date('Y-m-d H:i:s',time()),
-                'Sys_id' => $param['Sys_id']
-            ];
-        }
-        Db::startTrans();
-        try {
-            //插入工单基本资料
-            $sql= \db('工单_基本资料')->fetchSql(true)->insert($param);
-            $res = \db()->query($sql);
-            //插入订单物料信息
-            $BomSql = \db('工单_bom资料')->fetchSql(true)->insertAll($data);
-            $BomRes = \db()->query($BomSql);
-
-            //提交
-            Db::commit();
-        }catch (\Exception $e){
-            //回滚
-            Db::rollback();
-        }
+        //新增订单插入至工单基本资料
+        $sql = \db('工单_基本资料')->fetchSql(true)->insert($param);
+        \db()->query($sql);
+
+        //判断新增时面料是否存在,如果有调用gtp自动生成BOM资料
+        if (!empty($param['面料'])) {
+            // 只有面料不为空时，才调用 GdGtpAiOrder 方法
+            $this->GdGtpAiOrder($param['订单编号']);
+        }
+
+//        $prefix = substr($param['订单编号'], 0, 2);  // e.g., "DC"
+//        $maxOrder = \db('工单_基本资料')
+//            ->where('订单编号', 'like', "{$prefix}%")
+//            ->order('订单编号', 'desc')
+//            ->limit(1)
+//            ->value('订单编号');
+//        if ($maxOrder) {
+//            $numericPart = substr($maxOrder, 2);
+//            $newNumericPart = str_pad((int)$numericPart + 1, strlen($numericPart), '0', STR_PAD_LEFT);
+//            $param['订单编号'] = $prefix . $newNumericPart;
+//        } else {
+//            $param['订单编号'] = $param['订单编号'];
+//        }
+//        $massage = $param['面料'].'，粘衬：'.$param['粘衬'];
+//        $data = [];
+//        foreach ($mianliao as $key => $value){
+//            $data[$key] = [
+//                'BOM_工单编号' => $param['订单编号'],
+//                'BOM_物料名称' => $value,
+//                'Sys_rq' => date('Y-m-d H:i:s',time()),
+//                'Sys_id' => $param['Sys_id']
+//            ];
+//        }
+//        //插入订单物料信息
+//        $BomSql = \db('工单_bom资料')->fetchSql(true)->insertAll($data);
+//        $BomRes = \db()->query($BomSql);
+//        Db::startTrans();
+//        try {
+//            //插入工单基本资料
+//            $sql= \db('工单_基本资料')->fetchSql(true)->insert($param);
+//            $res = \db()->query($sql);
+//            //插入订单物料信息
+//            $BomSql = \db('工单_bom资料')->fetchSql(true)->insertAll($data);
+//            $BomRes = \db()->query($BomSql);
+//
+//            //提交
+//            Db::commit();
+//        }catch (\Exception $e){
+//            //回滚
+//            Db::rollback();
+//        }
         $this->success('成功');
     }
 
@@ -1997,7 +2009,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_库存总量 as 入库总量,a.BOM_门封 as 门封,a.BOM_面料结余 as 面料结余,a.Sys_ID as ID,a.Sys_rq 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 日期')
             ->where($where)
             ->whereNull('a.Mod_rq')
             ->select();
@@ -2206,6 +2218,10 @@ class WorkOrder extends Api
         if (empty($param)){
             $this->error('请求错误');
         }
+        // 判断前端传来的参数是否为空，避免空订单编号造成问题
+        if(empty($param[0]['BOM_工单编号'])){
+            $this->error('请求错误,请重新打开此页面');
+        }
         foreach ($param as $key=>$value){
             $data = $value;
             unset($data['UNIQID']);
@@ -2289,30 +2305,61 @@ class WorkOrder extends Api
         if (empty($param) || !isset($param['order'])){
             $this->error('参数错误');
         }
+        // 定义查询字段
+            $fields = '
+                a.id,
+                a.order_id as 订单编号,
+                a.客户编号,
+                a.款号 as 生产款号,
+                a.款式,
+                a.物料名称,
+                b.BOM_计划用量 as 计划用料,
+                b.BOM_标准用量 as 定额用料,
+                b.BOM_计划门幅 as 计划门幅,
+                b.BOM_定额门幅 as 定额门幅,
+                b.BOM_实际用量 as 裁床实际用料,
+                b.Bom_领用数量 as 裁床领用面料,
+                b.BOM_退还数量 as  裁床退还数量,
+                b.BOM_库存总量 as 库存总量,
+                b.BOM_面料结余 as 面料结余,
+                a.number as 入库数量,
+                a.number as 出库数量,
+                b.BOM_投料单位 as 投料单位,
+                a.rq as 入库时间,
+                a.rq as 出库时间,
+                a.sys_id as 入库人员,
+                a.sys_id as 出库人员,
+                a.recipient as 领用人员,
+                a.receipt_number as 单号,
+                b.BOM_desc as 备注
+            ';
         if (isset($param['searchh']) || !empty($param['search'])){
-            $list['入库记录'] = \db('设备_报工日志')
-                ->where('receipt_number',$param['order'])
-                ->where('name','入库')
-                ->field('id,order_id as 订单编号,款号,number as 数量,rq as 入库时间,sys_id as 入库人员,recipient as 入仓人员,receipt_number as 单号,物料名称')
-                ->order('入库时间 desc')
-                ->whereNull('Mod_rq')
+            $list['入库记录'] = \db('设备_报工日志')->alias('a')
+                ->join('工单_bom资料 b', 'b.BOM_工单编号 = a.order_id AND a.物料名称 = b.BOM_物料名称', 'left')  // 多条件关联
+                ->where('a.receipt_number', $param['order'])
+                ->where('a.name', '入库')
+                ->field($fields)
+                ->order('a.rq desc')
+                ->whereNull('a.Mod_rq')
                 ->select();
         }else{
             //出库记录查询
-            $list['出库记录'] = \db('设备_报工日志')
-                ->where('receipt_number',$param['order'])
-                ->where('name','出库')
-                ->field('id,order_id as 订单编号,款号,number as 数量,rq as 出库时间,sys_id as 出库人员,recipient as 出库人员,receipt_number as 单号,物料名称')
-                ->order('出库时间 desc')
-                ->whereNull('Mod_rq')
+            $list['出库记录'] = \db('设备_报工日志')->alias('a')
+                ->join('工单_bom资料 b', 'b.BOM_工单编号 = a.order_id AND a.物料名称 = b.BOM_物料名称', 'left')  // 多条件关联
+                ->where('a.receipt_number', $param['order'])
+                ->where('a.name', '出库')
+                ->field($fields)
+                ->order('a.rq desc')
+                ->whereNull('a.Mod_rq')
                 ->select();
             //退还记录查询
-            $list['退还记录'] = \db('设备_报工日志')
-                ->where('receipt_number',$param['order'])
-                ->where('name','退还')
-                ->field('id,order_id as 订单编号,款号,number as 数量,rq as 退还时间,sys_id as 退还机台,recipient as 退还人员,receipt_number as 单号,物料名称')
-                ->order('退还时间 desc')
-                ->whereNull('Mod_rq')
+            $list['退还记录'] = \db('设备_报工日志')->alias('a')
+                ->join('工单_bom资料 b', 'b.BOM_工单编号 = a.order_id AND a.物料名称 = b.BOM_物料名称', 'left')  // 多条件关联
+                ->where('a.receipt_number', $param['order'])
+                ->where('a.name', '退还')
+                ->field($fields)
+                ->order('a.rq desc')
+                ->whereNull('a.Mod_rq')
                 ->select();
         }
         $this->success('成功',$list);
@@ -2450,7 +2497,7 @@ class WorkOrder extends Api
             ->alias('a')
             ->join('工单_基本资料 b', 'b.订单编号 = a.BOM_工单编号')
             ->field('DATE_FORMAT(a.Sys_rq, "%Y-%m") as date')  // 提取年月，格式化为 "YYYY-MM"
-            ->group('date')  // 对年月字段去重
+            ->group('date')
             ->order('date desc')
             ->select();
 
@@ -2505,7 +2552,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_库存总量 as 入库总量, a.BOM_门封 as 门封, a.BOM_面料结余 as 面料结余, a.Sys_ID as ID, a.Sys_rq 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 日期')
             ->where($where)
             ->order("a.BOM_工单编号 desc")
             ->limit(($page - 1) * $limit, $limit)
@@ -2634,12 +2681,14 @@ class WorkOrder extends Api
             ->field('receipt_number as 出库单,order_id as 订单编号,款号,物料名称,rq as 日期,sys_id as 操作机台,recipient as 领料人员,name as 单号类型')
             ->group('出库单')
             ->order('rq desc')
+            ->where('Mod_rq',null)
             ->limit(($page-1)*$limit,$limit)
             ->select();
         $count = \db('设备_报工日志')
             ->where($where)
             ->field('receipt_number as 出库单')
             ->group('出库单')
+            ->where('Mod_rq',null)
             ->order('rq desc')
             ->select();
         if (empty($list)){
@@ -2672,7 +2721,7 @@ class WorkOrder extends Api
             ->order('month DESC')
             ->select();
         if (empty($list)){
-            $this->error('未找到数据');
+            $this->error('未查询到入库、出库、退还数据');
         }else{
             $this->success('成功',$list);
         }
@@ -2725,27 +2774,24 @@ class WorkOrder extends Api
 
     /**
      * 面料汇总左侧菜单
-     * @return void
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
+     * 此接口已在/work_order/fabricListmonth使用
      */
-    public function getFabricTab()
-    {
-        if ($this->request->isGet() === false){
-            $this->error('请求错误');
-        }
-        $list = \db('工单_bom资料')
-            ->field([
-                "DATE_FORMAT(Sys_rq, '%Y-%m') AS month",
-            ])
-            ->group('month')
-            ->order('month DESC')
-            ->select();
-        if (empty($list)){
-            $this->error('未找到数据');
-        }else{
-            $this->success('成功',$list);
-        }
-    }
+//    public function getFabricTab()
+//    {
+//        if ($this->request->isGet() === false){
+//            $this->error('请求错误');
+//        }
+//        $list = \db('工单_bom资料')
+//            ->field([
+//                "DATE_FORMAT(Sys_rq, '%Y-%m') AS month",
+//            ])
+//            ->group('month')
+//            ->order('month DESC')
+//            ->select();
+//        if (empty($list)){
+//            $this->error('未找到数据');
+//        }else{
+//            $this->success('成功',$list);
+//        }
+//    }
 }

application/api/controller/WorkOrderSpotCheck.php

@@ -2549,6 +2549,7 @@ class WorkOrderSpotCheck extends Api{
             case '大烫':
             case '总检':
             case '包装':
+
                 //调用reportWork方法名函数
                 $this->reportWork($params);
                 break;
@@ -2756,6 +2757,7 @@ class WorkOrderSpotCheck extends Api{
                 } elseif ($value['name'] === '退还'){
                     $lastNumber['BOM_面料结余'] += $number;  // 增加面料结余
                     $lastNumber['BOM_退还数量'] += $number;   // 增加退还数量
+                    $lastNumber['BOM_实际用量'] = $lastNumber['Bom_领用数量'] - $lastNumber['BOM_退还数量'];
                 } else {
                     $lastNumber['BOM_库存总量'] += $number;   // 增加库存总量
                     $lastNumber['BOM_面料结余'] += $number;  // 增加面料结余
@@ -2798,7 +2800,8 @@ class WorkOrderSpotCheck extends Api{
         $list = \db('工单_基本资料')
             ->where('订单编号|生产款号','like','%'.$param['search'].'%')
             ->where('Mod_rq',null)
-            ->field('订单编号,生产款号,客户编号,款式,接单日期,Sys_id as 创建人员,Sys_rq as 创建时间')
+            ->field('订单编号,生产款号,客户编号,款式,订单数量,落货日期,接单日期,Sys_id as 创建人员,Sys_rq as 创建时间')
+            ->order('订单编号 desc')
             ->select();
         if (empty($list)){
             $this->success('未找到相关订单信息');