颜色新增优化

application/api/controller/WorkOrder.php

@@ -505,6 +505,7 @@ class WorkOrder extends Api
         $color = \db('工单_面料资料')
             ->where('Bom_工单编号',$param['订单编号'])
             ->where('BOM_颜色',$param['颜色备注'])
+            ->where('Mod_rq',null)
             ->select();
         $colorList = [];
         if (empty($color)){
@@ -557,12 +558,17 @@ class WorkOrder extends Api
             //工单工艺录入
             $proSql = \db('工单_工艺资料')->fetchSql(true)->insertAll($processDetail);
             $proRes = \db()->query($proSql);
-            //工单面料录入
-            $fabricSql = \db('工单_面料资料')->fetchSql(true)->insertAll($colorList);
-            $fabricRes = \db()->query($fabricSql);
-            //工单关联表录入
-            $meterieSql = \db('工单关联表')->fetchSql(true)->insertAll($MaterielList);
-            $meterieRes = \db()->query($meterieSql);
+            if (!empty($colorList)){
+                //工单面料录入
+                $fabricSql = \db('工单_面料资料')->fetchSql(true)->insertAll($colorList);
+                $fabricRes = \db()->query($fabricSql);
+            }
+            if (!empty($MaterielList)){
+                //工单关联表录入
+                $meterieSql = \db('工单关联表')->fetchSql(true)->insertAll($MaterielList);
+                $meterieRes = \db()->query($meterieSql);
+            }
+
             // 提交事务
             db()->commit();
         } catch (\Exception $e) {
@@ -1734,6 +1740,7 @@ class WorkOrder extends Api
         $this->success('修改成功');
     }
 
+
     /**
      * 入库、出库、退还详情数据
      */
@@ -2279,53 +2286,6 @@ class WorkOrder extends Api
     }
 
 
-    //批量生成工单数据
-//    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);
-//                    }
-//                }
-//
-//            }
-//        }
-//    }
+    //单条工单BOM删除接口
+
 }