花材列表数据修改: 增加返回 is_delete

biz/item/classes/PtItemClass.php

@@ -20,10 +20,15 @@ class PtItemClass extends BaseClass
         $data = self::getList('*', $where, 'inTurn DESC');
         $list = $data['list'];
         $sjItemIds = [];
+        $sjItmes = [];
         if ($showSelect && $sjId) {
             $sjItemIds = ProductClass::getAllByCondition($where = ['sjId' => $sjId], null, "*");
-            $sjItemIds = array_column($sjItemIds, 'itemId');
-            $sjItemIds = array_unique($sjItemIds);
+
+            foreach($sjItemIds as $item) {
+                $sjItmes[$item['itemId']] = ['ghsItmeId' => $item['id'], 'delStatus' => $item['delStatus']];
+            }
+            //$sjItemIds = array_column($sjItemIds, 'itemId');
+            //$sjItemIds = array_unique($sjItemIds);
         }
         $classIds = array_column($list, "classId");
         $classNameMap = PtItemClassClass::getNameMap($classIds);
@@ -38,8 +43,11 @@ class PtItemClass extends BaseClass
                 $list[$k]['className'] = $classNameMap[$v['classId']] ?? '';
                 if ($showSelect) {
                     //1未选 2已选
-                    $select = in_array($v['id'], $sjItemIds) ? 2 : 1;
-                    $list[$k]['select'] = $select;
+                    //$select = in_array($v['id'], $sjItemIds) ? 2 : 1;
+                    $list[$k]['select'] = key_exists($v['id'], $sjItmes) ? 2 : 1;
+                    //0显示（未删除） 1不显示（删除）
+                    $list[$k]['is_delete'] = isset($sjItmes[$v['id']]['delStatus']) ? ($sjItmes[$v['id']]['delStatus'] == 1 ? 1 : 0) : 0;
+                    $list[$k]['ghsItmeId'] = $sjItmes[$v['id']]['ghsItmeId'];
                 }
             }
         }