工单删除，物料同步

application/api/controller/Synchronization.php

@@ -33,32 +33,23 @@ class Synchronization extends Api
         }
         $j = $m = $n =0;
         foreach ($workOrderList as $key=>$value){
-            //插入产品资料
-            $productData = \db('产品_基本资料')
-                ->where('产品编号',$value['成品编号'])
+            //插入产品印件资料
+            $PrintData = \db('产品_印件资料')
+                ->where('yj_cpdh',$value['成品编号'])
+                ->where('yj_yjdh',$value['产品编号'])
                 ->count();
-            if ($productData === 0){
-                $clientCode = substr($value['成品编号'],0,5);
-                $product = [
-                    '客户编号' => $clientCode,
-                    '客户名称' => $value['客户名称'],
-                    '产品编号' => $value['成品编号'],
-                    '产品名称' => $value['成品名称'],
-                    '计量单位' => '万张',
-                    '状态' => '',
-                    'Mod_rq' => date('Y-m-d H:i:s',time()),
-                    'UniqID' => \db('产品_基本资料')->order('UniqID desc')->value('UniqID')+1,
+            if ($PrintData === 0){
+                $print = [
+                    'yj_cpdh' => $value['成品编号'],
+                    'yj_yjno' => $value['行号'],
+                    'yj_yjdh' => $value['产品代号'],
+                    'yj_yjmc' => $value['产品名称'],
+                    'sys_id' => '[1012/开单员]',
+                    'sys_rq' => date('Y-m-d H:i:s',time()),
+                    'UniqId' =>\db('产品_资料')->order('UniqID desc')->value('UniqID')+1,
                 ];
-                if (strpos($value['成品名称'],'小盒') === false){
-                    $product['产品类别'] = '条盒';
-                }else{
-                    $product['产品类别'] = '小盒';
-                }
-                $productSql = \db('产品_基本资料')->fetchSql(true)->insert($product);
-                $productRes = \db()->query($productSql);
-                if ($productRes === false){
-                    $n++;
-                }
+                $printSql = \db('产品_印件资料')->fetchSql(true)->insert($print);
+                \db()->query($printSql);
             }
             //插入工单资料
             if (preg_match("/[A-Za-z]/",$value['工单编号'])){
@@ -565,6 +556,35 @@ class Synchronization extends Api
         }
         $i = 0;
         foreach ($OrganizationalDataList as $key=>$value){
+            $code = substr($value['物料代码'],0,3);
+            if ($code === 'Y10' || $code === 'Y14'){
+                //插入产品资料
+                $productData = \db('产品_基本资料')
+                    ->where('产品编号',$value['物料代码'])
+                    ->count();
+                $clientCode = substr($value['物料代码'],0,5);
+                $clientName = \db('物料_存货结构')->where('编号',$clientCode)->value('rtrim(名称)');
+                $product = [
+                    '客户编号' => $clientCode,
+                    '客户名称' => $clientName,
+                    '产品编号' => $value['物料代码'],
+                    '产品名称' => $value['物料名称'],
+                    '计量单位' => $value['领用单位'],
+                    '状态' => '',
+                    'U8UID' => $value['U8_UID'],
+                    '产品类别' => $value['规格'],
+                    'Sys_id' => '[272/超级用户]',
+                    'Sys_rq' => date('Y-m-d H:i:s',time()),
+                    'Mod_rq' => date('Y-m-d H:i:s',time()),
+                ];
+                if ($productData === 0){
+                    $product['UniqID'] = \db('产品_基本资料')->order('UniqID desc')->value('UniqID')+1;
+                    $productSql = \db('产品_基本资料')->fetchSql(true)->insert($product);
+                }else{
+                    $productSql = \db('产品_基本资料')->where('产品编号',$value['物料代码'])->fetchSql(true)->update($product);
+                }
+                $productRes = \db()->query($productSql);
+            }
             $data = [
                 '物料代码'=>$value['物料代码'],
                 '物料名称'=>$value['物料名称'],

application/api/controller/WorkOrder.php

@@ -2315,6 +2315,9 @@ class WorkOrder extends Api
                 if (!empty(\db('工单_印件资料')->where('Yj_Gdbh',$workorder)->find())){
                     \db('工单_印件资料')->where('Yj_Gdbh',$workorder)->delete();
                 }
+                if (!empty(\db('工单_bom资料')->where('BOM_工单编号',$workorder)->find())){
+                    \db('工单_bom资料')->where('BOM_工单编号',$workorder)->delete();
+                }
                 \db()->commit();
             }catch (\Exception $e){
                 \db()->rollback();