星科源

app/Http/Controllers/Api/U8Controller.php

@@ -211,9 +211,11 @@ class U8Controller extends BaseController
     public function stockList(Request $request)
     {
         $userData = $request->userData;
-        $service = new U8XkyServerService();
-        list($status,$data) = $service->stockList($request->all(),$userData);
+        $service = new U8ServerService($userData);
+        $error = $service->getError();
+        if(! empty($error)) return $this->json_return(201, $error);
 
+        list($status,$data) = $service->stockList($request->all(),$userData);
         if($status){
             return $this->json_return(200,'',$data);
         }else{
@@ -276,7 +278,10 @@ class U8Controller extends BaseController
     public function vendorU8List(Request $request)
     {
         $userData = $request->userData;
-        $service = new U8XkyServerService();
+        $service = new U8ServerService($userData);
+        $error = $service->getError();
+        if(! empty($error)) return $this->json_return(201, $error);
+
         list($status,$data) = $service->vendorU8List($request->all(),$userData);
 
         if($status){
@@ -289,7 +294,10 @@ class U8Controller extends BaseController
     public function vendorClassTree(Request $request)
     {
         $userData = $request->userData;
-        $service = new U8XkyServerService();
+        $service = new U8ServerService($userData);
+        $error = $service->getError();
+        if(! empty($error)) return $this->json_return(201, $error);
+
         list($status,$data) = $service->vendorClassTree($request->all(),$userData);
 
         if($status){
@@ -302,7 +310,10 @@ class U8Controller extends BaseController
     public function inventoryClassTree(Request $request)
     {
         $userData = $request->userData;
-        $service = new U8XkyServerService();
+        $service = new U8ServerService($userData);
+        $error = $service->getError();
+        if(! empty($error)) return $this->json_return(201, $error);
+
         list($status,$data) = $service->inventoryClassTree($request->all(),$userData);
 
         if($status){
@@ -315,7 +326,10 @@ class U8Controller extends BaseController
     public function getUnitGroups(Request $request)
     {
         $userData = $request->userData;
-        $service = new U8XkyServerService();
+        $service = new U8ServerService($userData);
+        $error = $service->getError();
+        if(! empty($error)) return $this->json_return(201, $error);
+
         list($status,$data) = $service->getUnitGroups($request->all(),$userData);
 
         if($status){
@@ -328,7 +342,10 @@ class U8Controller extends BaseController
     public function getComputationUnitList(Request $request)
     {
         $userData = $request->userData;
-        $service = new U8XkyServerService();
+        $service = new U8ServerService($userData);
+        $error = $service->getError();
+        if(! empty($error)) return $this->json_return(201, $error);
+
         list($status,$data) = $service->getComputationUnitList($request->all(),$userData);
 
         if($status){

app/Service/Service.php

@@ -840,6 +840,7 @@ class Service
     public function generateBillNo($need = [], $length = 5)
     {
         $type = $need['type'];
+        $login_type = $need['login_type'];
         $prefix = $need['prefix'] ?? '';
         $period = $need['period']; // 示例：202603
 
@@ -854,6 +855,7 @@ class Service
         // 2. 获取本次生成的流水号
         $sequence = DB::table('sys_bill_sequences')
             ->where('bill_type', $type)
+            ->where('login_type', $login_type)
             ->where('period', $period)
             ->value('current_value');
 

app/Service/U8DatabaseServerService.php

@@ -5,25 +5,34 @@ namespace App\Service;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\DB;
 
-class U8DatabaseServerService extends Service
+class U8DatabaseServerService
 {
     public $db = null;
-    public $error = null; // 错误信息
+    public $error = null; // 错误信息存储
     private $database = "";
     private $connName = "";
 
     public function __construct($loginUser = [])
     {
         $this->database = $loginUser['zt_database'] ?? "";
-        $this->connName = 'sqlsrv_' . $this->database . '_' . uniqid();
+
+        if (empty($this->database)) {
+            $this->error = "账套数据库名称不能为空";
+            return;
+        }
+
+        $this->connName = 'sqlsrv_dynamic_' . md5($this->database);
+
         $this->createConnection();
     }
 
+    /**
+     * 创建 SQL Server 连接
+     */
     private function createConnection()
     {
         $mainConnName = $this->connName;
 
-        // 创建连接
         $mainConfig = [
             'driver'   => 'sqlsrv',
             'host'     => env('SQLSRV_HOST'),
@@ -32,72 +41,52 @@ class U8DatabaseServerService extends Service
             'username' => env('SQLSRV_USERNAME'),
             'password' => env('SQLSRV_PASSWORD'),
             'options'  => [
-                \PDO::SQLSRV_ATTR_QUERY_TIMEOUT => 15,  // 减少超时
+                \PDO::SQLSRV_ATTR_QUERY_TIMEOUT => 15, // 查询超时
                 \PDO::ATTR_ERRMODE => \PDO::ERRMODE_EXCEPTION,
             ],
+            'charset'  => 'utf8',
+            'prefix'   => '',
         ];
 
-        // 配置注入
-        Config::set("database.connections.{$mainConnName}", $mainConfig);
+        try {
+            // 1. 动态注入配置
+            Config::set("database.connections.{$mainConnName}", $mainConfig);
 
-        // 连接
-        $this->db = DB::connection($mainConnName);
+            // 2. 获取连接句柄
+            $this->db = DB::connection($mainConnName);
 
-        // 测试
-        $this->validateConnection($this->db);
+            // 3. 验证连接（执行一次 SELECT 1）
+            // 注意：SQLServer 有时候会因为防火墙或网络伪连，这里必须 try 才能抓到错误
+            $this->db->getPdo();
 
-        // 如果失败，立即清理，避免残留连接名
-        if ($this->error) {
-            $this->safeDisconnect($this->db, $mainConnName);
-        }
-    }
-
-    private function validateConnection($connection)
-    {
-        try {
-            $pdo  = $connection->getPdo();
-            $stmt = $pdo->prepare("SELECT 1 AS connection_test");
-            $stmt->execute();
         } catch (\Throwable $e) {
-            $this->error = "数据库连接验证失败: " . $e->getMessage();
+            $this->error = "SQLServer连接验证失败: " . $e->getMessage();
+            // 如果连接失败，清理掉无效配置
+            $this->close();
         }
     }
 
     /**
-     * 手动关闭连接（定时任务必须调用）
+     * 手动关闭并清理连接 (非常关键)
+     * 特别是在 Command 脚本中，不调用这个会导致数据库句柄残留
      */
     public function close()
-    {
-        $this->safeDisconnect($this->db, $this->connName);
-    }
-
-    private function safeDisconnect(&$connection, $name)
     {
         try {
-            if ($connection instanceof \Illuminate\Database\Connection) {
-
-                // 断开物理连接
-                $connection->disconnect();
-
-                // 清除 Laravel 连接池
-                DB::purge($name);
+            if ($this->connName) {
+                // 1. 断开物理连接
+                DB::disconnect($this->connName);
 
-                // 移除配置
-                Config::offsetUnset("database.connections.{$name}");
+                // 2. 从 Laravel 的连接池中彻底清除
+                DB::purge($this->connName);
 
-                // 引用置空
-                $connection = null;
+                // 3. 移除动态注入的 Config
+                Config::offsetUnset("database.connections.{$this->connName}");
             }
         } catch (\Throwable $e) {
-            // 忽略
+            // 忽略清理时的异常
+        } finally {
+            $this->db = null;
         }
     }
-
-    /**
-     * 阻止依赖 __destruct
-     */
-    public function __destruct()
-    {
-        // 不做任何事，避免不确定行为
-    }
-}
+}

app/Service/U8ServerService.php

@@ -2,6 +2,8 @@
 
 namespace App\Service;
 
+use App\Model\DDEmployee;
+use App\Model\FieldData;
 use App\Model\Inventory;
 use App\Model\Record;
 use App\Model\Vendor;
@@ -278,4 +280,660 @@ class U8ServerService extends Service
 
         return $list;
     }
+
+    public function stockList($data, $user)
+    {
+        try {
+            $field_list = [];
+            $employee = DDEmployee::where('userid', $user['userid'])->where('login_type', $user['login_type'])->first();
+            $qx = $employee['qx'] ?? 0;
+            if(empty($qx)) {
+                $field_list = FieldData::where('userid', $user['userid'])
+                    ->where('login_type', $user['login_type'])
+                    ->where('type', FieldData::STATE_ZERO)
+                    ->pluck('key')
+                    ->all();
+            }
+
+            // 1. 构建基础查询：关联现存量表和存货档案表
+            $query = $this->databaseService->table('CurrentStock as S')
+                ->select([
+                    'S.cWhCode',              // 仓库编码
+                    'W.cWhName',              // 仓库名称
+                    'S.cInvCode',             // 存货编码
+                    'I.cInvName',             // 存货名称
+                    'I.cInvStd',              // 规格型号
+                    'I.cInvCCode',            // 分类编码
+
+                    // --- 数量字段对齐你的结构 ---
+                    'S.iQuantity',            // 结存数量 (账面现存量)
+                    'S.fAvaQuantity',         // 可用数量
+                    'S.fOutQuantity',         // 待发货数量 (待出)
+                    'S.fInQuantity',          // 待入库数量 (待入)
+                    'S.fStopQuantity',        // 冻结数量
+
+                    // --- 批次与日期 ---
+                    'S.cBatch',               // 批号
+                    'S.dMdate',               // 生产日期
+                    'S.dVDate',               // 失效日期
+                ])
+                ->join('Inventory as I', 'S.cInvCode', '=', 'I.cInvCode')
+                ->leftJoin('Warehouse as W', 'S.cWhCode', '=', 'W.cWhCode')
+                ->leftJoin('InventoryClass as IC', 'I.cInvCCode', '=', 'IC.cInvCCode');
+
+            // 2. 过滤条件：存货名称 (支持模糊查询)
+            if (!empty($data['material_title'])) {
+                $query->where('I.cInvName', 'like', '%' . $data['material_title'] . '%');
+            }
+
+            // 2. 过滤条件：存货编码 (支持模糊查询)
+            if (!empty($data['material_code'])) {
+                $query->where('S.cInvCode', 'like', '%' . $data['material_code'] . '%');
+            }
+
+            // 3. 过滤条件：存货分类 (支持左匹配，即选大类查出所有子类)
+            if (!empty($data['category_code'])) {
+                // U8 分类是级次结构，用 like '01%' 可以查出 01 开头的所有子类
+                $query->where('I.cInvCCode', 'like', $data['category_code'] . '%');
+            }
+
+            // 6. 排序
+            $query->orderBy('S.cInvCode', 'asc')->orderBy('S.cWhCode', 'asc');
+
+            // 7. 调用你定义的分页方法
+            $columns = ['*'];
+            $result = $this->limit($query, $columns, $data);
+
+            // 注意这里的 &$item，加了 & 符号才能直接修改原数组里的内容
+            foreach ($result['data'] as &$item) {
+                $numFields = ['iQuantity', 'fAvaQuantity', 'fOutQuantity', 'fInQuantity', 'fStopQuantity'];
+
+                foreach ($numFields as $field) {
+                    if (isset($item->$field)) {
+                        $item->$field = (float)$item->$field;
+                    }
+                }
+
+                $item->dMdate = $item->dMdate ? date('Y-m-d', strtotime($item->dMdate)) : '';
+                $item->dVDate = $item->dVDate ? date('Y-m-d', strtotime($item->dVDate)) : '';
+
+                // 脱敏处理
+                if (!empty($field_list)) {
+                    foreach ($field_list as $blackField) {
+                        if (isset($item->$blackField)) {
+                            $item->$blackField = '*****';
+                        }
+                    }
+                }
+            }
+            unset($item); // 销毁引用
+
+            return [true, $result];
+
+        } catch (\Throwable $exception) {
+            return [false, "查询库存失败: " . $exception->getMessage()];
+        }
+    }
+
+    public function vendorU8List($data, $user)
+    {
+        // 1. 构建基础查询
+        $query = $this->databaseService->table('Vendor as V')
+            ->select([
+                'V.cVenCode',          // 供应商编码
+                'V.cVenName',          // 供应商名称
+                'V.cVenAbbName',       // 供应商简称
+                'V.cVCCode',           // 分类编码
+                'VC.cVCName',         // 分类名称 (来自 VendorClass)
+                'V.cVenAddress',       // 地址
+                'V.cVenPhone',         // 电话
+                'V.dVenDevDate',       // 发展日期
+                'V.cCreatePerson',     // 创建人
+                'V.bVenTax',           // 是否计税
+                'V.iId'                // 内部ID
+            ])
+            // 关联供应商分类表获取分类名称
+            ->leftJoin('VendorClass as VC', 'V.cVCCode', '=', 'VC.cVCCode');
+
+        // 2. 增加搜索逻辑 (可选)
+        if (!empty($data['keyword'])) {
+            $keyword = $data['keyword'];
+            $query->where(function($q) use ($keyword) {
+                $q->where('V.cVenCode', 'like', "%{$keyword}%")
+                    ->orWhere('V.cVenName', 'like', "%{$keyword}%")
+                    ->orWhere('V.cVenAbbName', 'like', "%{$keyword}%");
+            });
+        }
+
+        // 3. 排序 (默认按编码排序)
+        $query->orderBy('V.cVenCode', 'ASC');
+
+        // 4. 调用你定义的分页方法
+        // 注意：limit 方法内部会执行 paginate 并将结果填充到 $data
+        $columns = ['*']; // select 已经在上面定义过了，这里传 * 即可
+        $result = $this->limit($query, $columns, $data);
+
+        return [true, $result];
+    }
+
+    public function vendorClassTree($data, $user)
+    {
+        try {
+            // 1. 获取所有供应商分类 (表名: VendorClass)
+            $classes = $this->databaseService->table('VendorClass')
+                ->select('cVCCode', 'cVCName', 'iVCGrade', 'bVCEnd') // 编码、名称、级次
+                ->orderBy('cVCCode', 'asc')
+                ->get();
+
+            if ($classes->isEmpty()) {
+                return [true, []];
+            }
+
+            // 2. 格式化数据，以编码为 Key
+            $classList = [];
+            foreach ($classes as $item) {
+                $classList[$item->cVCCode] = [
+                    'label'    => $item->cVCName,
+                    'value'    => $item->cVCCode, // 前端通常需要 value 字段
+                    'code'     => $item->cVCCode,
+                    'grade'    => $item->iVCGrade,
+                    'is_end'    => $item->bVCEnd,
+                    'children' => []
+                ];
+            }
+
+            // 3. 构建引用树
+            $tree = [];
+            foreach ($classList as $code => &$node) {
+                // 获取父级编码
+                $parentCode = $this->getParentCode($code);
+
+                if ($parentCode === null || !isset($classList[$parentCode])) {
+                    // 顶级节点
+                    $tree[] = &$node;
+                } else {
+                    // 挂载到父节点
+                    $classList[$parentCode]['children'][] = &$node;
+                }
+            }
+
+            return [true, $tree];
+
+        } catch (\Throwable $exception) {
+            return [false, "获取供应商分类树失败: " . $exception->getMessage()];
+        }
+    }
+
+    /**
+     * 辅助函数：根据 U8 编码规则获取父级编码
+     * U8 的级次通常存储在 GradeDef 表，但通用逻辑是截取末尾
+     */
+    private function getParentCode($code)
+    {
+        $len = strlen($code);
+        if ($len <= 2) return null; // 假设第一级是2位，小于等于2位则无父级
+
+        // 这里假设级次是 2-2-2-2 (最常见配置)
+        // 实际生产中，如果级次不固定，建议查询 GradeDef 表
+        return substr($code, 0, $len - 2);
+    }
+
+    //U8 存货分类树结构
+    public function inventoryClassTree($data, $user)
+    {
+        try {
+            // 1. 从数据库获取所有存货分类
+            $classes = $this->databaseService->table('InventoryClass')
+                ->select('cInvCCode', 'cInvCName', 'iInvCGrade', 'bInvCEnd')
+                ->orderBy('cInvCCode', 'asc')
+                ->get();
+
+            if ($classes->isEmpty()) return [true, []];
+
+            // 2. 将集合转换为数组并以编码作为 Key，方便查找
+            $classList = [];
+            foreach ($classes as $item) {
+                $classList[$item->cInvCCode] = [
+                    'label'    => $item->cInvCName,
+                    'code'     => $item->cInvCCode,
+                    'grade'    => $item->iInvCGrade,
+                    'is_end'    => $item->bInvCEnd,
+                    'children' => []
+                ];
+            }
+
+            // 3. 构建树形结构
+            $tree = [];
+            foreach ($classList as $code => &$node) {
+                // 获取当前分类的级次 (U8 逻辑通常根据编码长度判断父级)
+                // 比如 0101 的父级是 01
+                $parentCode = $this->getParentCode($code);
+
+                if ($parentCode === null || !isset($classList[$parentCode])) {
+                    // 如果没有父级编码，或者父级编码不在列表里，说明是顶级分类
+                    $tree[] = &$node;
+                } else {
+                    // 将当前节点引用到父节点的 children 数组中
+                    $classList[$parentCode]['children'][] = &$node;
+                }
+            }
+
+            return [true, $tree];
+
+        } catch (\Throwable $exception) {
+            return [false, "获取分类树失败: " . $exception->getMessage()];
+        }
+    }
+
+    //U8 计量单位组（带默认主计量单位）
+    public function getUnitGroups($data, $user)
+    {
+        $list = $this->databaseService->select("
+        SELECT 
+            G.cGroupCode, 
+            G.cGroupName, 
+            G.iGroupType, 
+            U.cComUnitCode, 
+            U.cComUnitName,
+            U.iNumber
+        FROM ComputationGroup AS G
+        OUTER APPLY (
+            SELECT TOP 1 cComUnitCode, cComUnitName, iNumber
+            FROM ComputationUnit
+            WHERE cGroupCode = G.cGroupCode
+            ORDER BY 
+                bMainUnit DESC,         -- 1. 优先主计量
+                iNumber ASC,            -- 2. 序号最小 (若 NULL 会排在最前)
+                cComUnitCode ASC        -- 3. 编码最小
+        ) AS U
+    ");
+
+        return [true, $list];
+    }
+
+    //U8 计量单位档案
+    public function getComputationUnitList($data, $user)
+    {
+        $list = $this->databaseService->table('ComputationUnit as U')
+            ->select(
+                'U.cComUnitCode',   // 单位编码
+                'U.cComUnitName',   // 单位名称
+                'U.cGroupCode',     // 所属组编码
+                'U.bMainUnit',      // 是否主单位
+                'U.iNumber'         // 排序序号
+            )
+            ->orderBy('U.cGroupCode', 'ASC')
+            ->orderBy('U.iNumber', 'ASC') // 按照你要求的 iNumber 排序
+            ->get();
+
+        return [true, $list];
+    }
+
+
+    //U8 存货新增到用友
+    public function inventoryAddToU8($data, $user){
+        $inventory = Inventory::where('del_time', 0)
+            ->where('id', $data['id'])
+            ->first();
+        if(empty($inventory)) return [false, '存货记录不存在或已被删除'];
+        $inventory = $inventory->toArray();
+        if($inventory['status'] != Inventory::STATE_TWO) return [false, '存货记录未审核通过'];
+
+        $title = $inventory['title'];
+        $category_code = $inventory['category_code'];
+        if(! empty($data['code'])){
+            //用户传入
+            $no = $inventory['code'];
+            $flag_title = "重填";
+        }else{
+            //生成编码
+            list($status, $msg) = $this->generate('inventory','1005');
+            if(! $status) return [false, $msg];
+            $no = $msg;
+            $flag_title = "重试";
+        }
+
+        $inventoryData = [
+            'cInvCode' => $no,
+            'cInvName' => $title,
+            'cInvCCode' => $category_code,
+            'cInvStd' => $inventory['size'] ?? null, // 规格型号
+            'bSale'         => $inventory['bSale'], //内销
+            'bExpSale'        => $inventory['bExpSale'], //外销
+            'bPurchase'     => $inventory['bPurchase'], // 采购
+            'bSelf'         => $inventory['bSelf'], // 自制
+            'bComsume'      => $inventory['bComsume'], // 生产耗材
+            'iGroupType' => $inventory['unit_group_type'], // 计量单位组类别
+            'cGroupCode' => $inventory['unit_group_code'], //计量单位组
+            'cComUnitCode' => $inventory['unit_code'], // 主计量单位
+            'cShopUnit' => $inventory['unit_code'], // 零售计量单位
+            'iImpTaxRate' => $inventory['iImpTaxRate'], // 进项税率
+            'iTaxRate'      => $inventory['iTaxRate'], // 销项税率
+            'dSDate' => date("Y-m-d 00:00:00.000"), // 启用日期
+            'cEnterprise' => $inventory['vendor_code_title'] ?? null,
+            'iSupplyType' => '0', // 供应类型
+            'fConvertRate' => '1.0', // 转换因子
+            'bInTotalCost' => '1', // 成本累计否
+            'cPlanMethod' => 'R',
+            'cSRPolicy' => 'PE',
+            'bBomMain' => '0', // 允许BOM母件
+            'bBomSub' => '0', // 允许BOM子件
+            'bProductBill' => '0', // 允许生产订单
+            'iPlanDefault' => '1',
+            'iAllocatePrintDgt' => '4',
+            'bService' => '0',
+            'bAccessary' => '0',
+            'iInvAdvance' => '0.0',
+            'bInvQuality' => '0',
+            'bInvBatch' => '0',
+            'bInvEntrust' => '0',
+            'bInvOverStock' => '0',
+            'bFree1' => '0',
+            'bFree2' => '0',
+            'bInvType' => '0',
+            'bFree3' => '0',
+            'bFree4' => '0',
+            'bFree5' => '0',
+            'bFree6' => '0',
+            'bFree7' => '0',
+            'bFree8' => '0',
+            'bFree9' => '0',
+            'bFree10' => '0',
+            'cCreatePerson' => 'demo',
+            'cModifyPerson' => 'demo', // 变更
+            'dModifyDate' => date("Y-m-d H:i:s.000"),
+            'bFixExch' => '0',
+            'bTrack' => '0',
+            'bSerial' => '0',
+            'bBarCode' => '0',
+            'bSolitude' => '0',
+            'bSpecialties' => '0',
+            'bPropertyCheck' => '0',
+            'iRecipeBatch' => '0',
+            'bPromotSales' => '0',
+            'bPlanInv' => '0',
+            'bProxyForeign' => '0',
+            'bATOModel' => '0',
+            'bCheckItem' => '0',
+            'bPTOModel' => '0',
+            'bEquipment' => '0',
+            'bMPS' => '0',
+            'bROP' => '0',
+            'bRePlan' => '0',
+            'bBillUnite' => '0',
+            'bCutMantissa' => '0',
+            'bConfigFree1' => '0',
+            'bConfigFree2' => '0',
+            'bConfigFree3' => '0',
+            'bConfigFree4' => '0',
+            'bConfigFree5' => '0',
+            'bConfigFree6' => '0',
+            'bConfigFree7' => '0',
+            'bConfigFree8' => '0',
+            'bConfigFree9' => '0',
+            'bConfigFree10' => '0',
+            'bPeriodDT' => '0',
+            'bOutInvDT' => '0',
+            'bBackInvDT' => '0',
+            'bDTWarnInv' => '0',
+            'bImportMedicine' => '0',
+            'bFirstBusiMedicine' => '0',
+            'bForeExpland' => '0',
+            'bInvModel' => '0',
+            'bKCCutMantissa' => '0',
+            'bReceiptByDT' => '0',
+            'bCheckBSATP' => '0',
+            'bCheckFree1' => '0',
+            'bCheckFree2' => '0',
+            'bCheckFree3' => '0',
+            'bCheckFree4' => '0',
+            'bCheckFree5' => '0',
+            'bCheckFree6' => '0',
+            'bCheckFree7' => '0',
+            'bCheckFree8' => '0',
+            'bCheckFree9' => '0',
+            'bCheckFree10' => '0',
+            'iCheckATP' => '0',
+            'bPiece' => '0',
+            'bSrvItem' => '0',
+            'bSrvFittings' => '0',
+            'bSpecialOrder' => '0',
+            'bTrackSaleBill' => '0',
+            'bCheckBatch' => '0',
+            'bMngOldpart' => '0',
+        ];
+
+        $inventorySubData = [
+            'cInvSubCode' => $no,
+            'iSurenessType' => '1',
+            'bIsAttachFile' => '0',
+            'bInByProCheck' => '1',
+            'iRequireTrackStyle' => '0',
+            'iExpiratDateCalcu' => '0',
+            'iBOMExpandUnitType' => '1',
+            'iDrawType' => $inventory['iDrawType'] ?? 0, // 领用方式
+            'fInvCIQExch' => $inventory['customs_change_rate'] ?? 1, // 海关换算率
+            'bInvKeyPart' => '1',
+            'iAcceptEarlyDays' => '999',
+            'dInvCreateDatetime' => date("Y-m-d H:i:s.000"),
+            'bPUQuota' => '0',
+            'bInvROHS' => '0',
+            'bPrjMat' => '0',
+            'bInvAsset' => '0',
+            'bSrvProduct' => '0',
+            'iAcceptDelayDays' => '0',
+            'bSCkeyProjections' => '0',
+            'iSupplyPeriodType' => '1',
+            'iAvailabilityDate' => '1',
+            'bImport' => '0',
+            'bCheckSubitemCost' => '1',
+            'fRoundFactor' => '0.0',
+            'bConsiderFreeStock' => '1',
+            'bSuitRetail' => '0',
+            'bFeatureMatch' => '0',
+            'bProduceByFeatureAllocate' => '0',
+            'bMaintenance' => '0',
+            'iMaintenanceCycleUnit' => '0',
+            'bCoupon' => '0',
+            'bStoreCard' => '0',
+            'bProcessProduct' => '0',
+            'bProcessMaterial' => '0',
+            // 所有的价格自由项默认设为 '0'
+            'bPurPriceFree1' => '0', 'bPurPriceFree2' => '0', 'bPurPriceFree3' => '0', 'bPurPriceFree4' => '0', 'bPurPriceFree5' => '0',
+            'bPurPriceFree6' => '0', 'bPurPriceFree7' => '0', 'bPurPriceFree8' => '0', 'bPurPriceFree9' => '0', 'bPurPriceFree10' => '0',
+            'bOMPriceFree1' => '0', 'bOMPriceFree2' => '0', 'bOMPriceFree3' => '0', 'bOMPriceFree4' => '0', 'bOMPriceFree5' => '0',
+            'bOMPriceFree6' => '0', 'bOMPriceFree7' => '0', 'bOMPriceFree8' => '0', 'bOMPriceFree9' => '0', 'bOMPriceFree10' => '0',
+            'bSalePriceFree1' => '0', 'bSalePriceFree2' => '0', 'bSalePriceFree3' => '0', 'bSalePriceFree4' => '0', 'bSalePriceFree5' => '0',
+            'bSalePriceFree6' => '0', 'bSalePriceFree7' => '0', 'bSalePriceFree8' => '0', 'bSalePriceFree9' => '0', 'bSalePriceFree10' => '0',
+            // 所有的控制自由项默认设为 '0'
+            'bControlFreeRange1' => '0', 'bControlFreeRange2' => '0', 'bControlFreeRange3' => '0', 'bControlFreeRange4' => '0', 'bControlFreeRange5' => '0',
+            'bControlFreeRange6' => '0', 'bControlFreeRange7' => '0', 'bControlFreeRange8' => '0', 'bControlFreeRange9' => '0', 'bControlFreeRange10' => '0',
+            // 所有的批次属性默认设为 '0'
+            'bBatchProperty1' => '0', 'bBatchProperty2' => '0', 'bBatchProperty3' => '0', 'bBatchProperty4' => '0', 'bBatchProperty5' => '0',
+            'bBatchProperty6' => '0', 'bBatchProperty7' => '0', 'bBatchProperty8' => '0', 'bBatchProperty9' => '0', 'bBatchProperty10' => '0',
+            'bBondedInv' => '0',
+            'bBatchCreate' => '0',
+        ];
+
+        try {
+            $this->databaseService->beginTransaction();
+
+            $exists = $this->databaseService->table('Inventory')
+                ->where('cInvCode', $inventoryData['cInvCode'])
+                ->lockForUpdate() // 锁定该行，防止并发冲突
+                ->exists();
+
+            if ($exists) return [false, '存货编码已存在，请' . $flag_title];
+
+            $this->databaseService->table('Inventory')->insert($inventoryData);
+            $this->databaseService->table('Inventory_sub')->insert($inventorySubData);
+
+            $this->databaseService->commit();
+        } catch (\Throwable $exception) {
+            $this->databaseService->rollBack();
+
+            return [false, "创建用友失败: " . $exception->getMessage()];
+        }
+
+        return [true, ''];
+    }
+
+    //U8 供应商新增
+    public function vendorAddToU8($data, $user){
+        $vendor = Vendor::where('del_time', 0)
+            ->where('id', $data['id'])
+            ->first();
+        if(empty($vendor)) return [false, '供应商记录不存在或已被删除'];
+        $vendor = $vendor->toArray();
+        if($vendor['status'] != Vendor::STATE_TWO) return [false, '供应商记录未审核通过'];
+
+        if(! empty($vendor['code'])){
+            //用户传入
+            $no = $vendor['code'];
+            $flag_title = "重填";
+        }else{
+            //生成编码
+            list($status, $msg) = $this->generate('vendor');
+            if(! $status) return [false, $msg];
+            $no = $msg;
+            $flag_title = "重试";
+        }
+
+        $vendorData = [
+            'cVenCode' => $no,
+            'cVenName' => $vendor['title'],
+            'cVenAbbName' => $vendor['easy_title'],
+            'cVCCode' => $vendor['category_code'],
+            'dVenDevDate' => date("Y-m-d 00:00:00.000"),
+            'iVenDisRate' => '0.0',
+            'iVenCreLine' => '0.0',
+            'iVenCreDate' => '0',
+            'cVenHeadCode' => $no,
+            'iAPMoney' => '0.0',
+            'iLastMoney' => '0.0',
+            'iLRMoney' => '0.0',
+            'iFrequency' => '0',
+            'bVenTax' => '1',
+            'cCreatePerson' => 'demo',
+            'cModifyPerson' => 'demo',
+            'dModifyDate' => date("Y-m-d H:i:s.000"),
+            'iGradeABC' => '-1',
+            'bLicenceDate' => '0',
+            'bBusinessDate' => '0',
+            'bProxyDate' => '0',
+            'bPassGMP' => '0',
+            'bVenCargo' => '1', // 采购
+            'bProxyForeign' => '0', // 委外
+            'bVenService' => '0', // 服务
+            'bVenOverseas' => '0', // 国外
+            'cVenExch_name' => '人民币',
+            'iVenGSPType' => '0',
+            'iVenGSPAuth' => '-1',
+            'bVenAccPeriodMng' => '0',
+            'bVenHomeBranch' => '0',
+            'dVenCreateDatetime' => date("Y-m-d H:i:s.000"),
+            'bIsVenAttachFile' => '0',
+            'bRetail' => '0',
+        ];
+
+        try {
+            $this->databaseService->beginTransaction();
+
+            $exists = $this->databaseService->table('Vendor')
+                ->where('cVenCode', $vendorData['cVenCode'])
+                ->lockForUpdate() // 锁定该行，防止并发冲突
+                ->exists();
+
+            if ($exists) return [false, '供应商编码已存在，请' . $flag_title];
+
+            $this->databaseService->table('Vendor')->insert($vendorData);
+
+            $this->databaseService->commit();
+
+        } catch (\Throwable $exception) {
+            $this->databaseService->rollBack();
+
+            return [false, "创建供应商失败: " . $exception->getMessage()];
+        }
+
+        return [true, ''];
+    }
+
+    // 生成编码
+    public function generate($type, $classCode = "")
+    {
+        try {
+            // 1. 确定对象映射
+            $cardNumber = ($type === 'inventory') ? 'inventory' : 'Vendor';
+            $cardNumber_name = ($type === 'inventory') ? '存货' : '供应商';
+            $table = ($type === 'inventory') ? 'Inventory' : 'Vendor';
+            $codeField = ($type === 'inventory') ? 'cInvCode' : 'cVenCode';
+
+            // 2. 获取 U8 规则定义
+            $rule = $this->databaseService->table('VoucherNumber')
+                ->where('CardNumber', $cardNumber)
+                ->first();
+
+            if (!$rule) return [false, "未找到 {$cardNumber_name} 的规则定义"];
+
+            /**
+             * 3. 动态解析前缀 (Prefix1, Prefix2, Prefix3)
+             * U8 的规则通常存放在 PrefixRule 或 Prefix 字段中
+             */
+            $prefix = "";
+            for ($i = 1; $i <= 3; $i++) {
+                $ruleField = "Prefix{$i}Rule";
+                $valField = "Prefix{$i}";
+
+                // 检查规则描述
+                $ruleDesc = $rule->$ruleField ?? ''; // 例如 "存货分类编码" 或 "GYS"
+                $staticVal = $rule->$valField ?? '';
+
+                if (str_contains($ruleDesc, '分类') || str_contains($staticVal, '分类')) {
+                    // 如果规则提到“分类”，则填入传入的分类编码
+                    $prefix .= $classCode;
+                } elseif (!empty($ruleDesc)) {
+                    // 如果规则是具体的字符（如 "GYS"），直接拼接
+                    $prefix .= $ruleDesc;
+                } elseif (!empty($staticVal) && $staticVal !== '手工输入' && $staticVal !== '存货分类编码') {
+                    // 如果静态值不是提示语，则作为前缀
+                    $prefix .= $staticVal;
+                }
+            }
+
+            // 4. 获取流水号配置 (Glide)
+            $glideLen = $rule->GlideLen > 0 ? $rule->GlideLen : 4;
+            $startNum = $rule->iStartNumber ?? 1;
+
+            // 5. 查找当前最大编码
+            $expectedLen = strlen($prefix) + $glideLen;
+
+            $lastCode = $this->databaseService->table($table)
+                ->where($codeField, 'like', $prefix . '%')
+                ->whereRaw("LEN($codeField) = $expectedLen")
+                ->orderBy($codeField, 'desc')
+                ->value($codeField);
+
+            // 6. 生成编码
+            if (!$lastCode) {
+                // 初始：前缀 + 起始值补零
+                $finalCode = $prefix . str_pad($startNum, $glideLen, '0', STR_PAD_LEFT);
+            } else {
+                // 截取流水号自增
+                $lastSerial = substr($lastCode, -$glideLen);
+                $nextSerial = ++$lastSerial;
+
+                // 溢出检查
+                if (strlen($nextSerial) > $glideLen) {
+                    return [false, "流水号已溢出"];
+                }
+                $finalCode = $prefix . str_pad($nextSerial, $glideLen, '0', STR_PAD_LEFT);
+            }
+
+            return [true, $finalCode];
+
+        } catch (\Throwable $e) {
+            return [false, "生成失败: " . $e->getMessage()];
+        }
+    }
 }

app/Service/U8XkyServerService.php

@@ -22,6 +22,7 @@ class U8XkyServerService extends Service
             $inventoryData = [
                 'order_number' => $this->generateBillNo([
                     'type' => Inventory::Order_type,
+                    'login_type' => $user['login_type'],
                     'period' => date("Ym")
                 ]),
                 'code' => $data['code'] ?? "",
@@ -44,6 +45,7 @@ class U8XkyServerService extends Service
                 'iImpTaxRate' => $data['iImpTaxRate'] ?? 0, // 进项税率
                 'iTaxRate'      => $data['iTaxRate'] ?? 0, // 销项税率
                 'customs_change_rate'      => $data['customs_change_rate'] ?? 0,
+                'login_type'      => $user['login_type'],
                 'crt_id' => $user['userid'],
                 'crt_time' => time(),
             ];
@@ -95,7 +97,7 @@ class U8XkyServerService extends Service
             DB::commit();
         } catch (\Throwable $exception) {
             DB::rollBack();
-            return [false, "创建存货失败: " . $exception->getMessage()];
+            return [false, "编辑存货失败: " . $exception->getMessage()];
         }
 
         return [true, ''];
@@ -141,6 +143,7 @@ class U8XkyServerService extends Service
 
         if(! empty($code)){
             $bool = Inventory::where('del_time', 0)
+                ->where('login_type', $user['login_type'])
                 ->when(! empty($id), function ($query) use($id){
                     return $query->where('id', '<>', $id);
                 })
@@ -151,6 +154,7 @@ class U8XkyServerService extends Service
 
         if(! $is_add){
             $bool = Inventory::where('del_time', 0)
+                ->where('login_type', $user['login_type'])
                 ->where('id', $id)
                 ->where('status', '>', Inventory::STATE_ZERO)
                 ->exists();
@@ -162,7 +166,8 @@ class U8XkyServerService extends Service
 
     public function inventoryCommon($data,$user, $field = []){
         $model = Inventory::where('del_time',0)
-            ->where('crt_id', $user['userid'])
+//            ->where('crt_id', $user['userid'])
+            ->where('login_type', $user['login_type'])
             ->orderby('id', 'desc');
 
         if(! empty($data['id'])) $model->where('id', $data['id']);
@@ -187,7 +192,11 @@ class U8XkyServerService extends Service
     public function fillInventoryData($data, $user){
         if(empty($data['data'])) return $data;
 
+        $map = DDEmployee::whereIn('userid', array_unique(array_column($data['data'],'crt_id')))
+            ->pluck('name','id')
+            ->toArray();
         foreach ($data['data'] as $key => $value){
+            $data['data'][$key]['crt_name'] = $map[$value['crt_id']] ?? "";
             $data['data'][$key]['crt_time'] = $value['crt_time'] ? date('Y-m-d H:i:s',$value['crt_time']) : '';
             $data['data'][$key]['status_title'] = Inventory::$name[$value['status']] ?? '';
             $data['data'][$key]['bSale'] = $value['bSale'] ? '是' : '否';
@@ -240,6 +249,7 @@ class U8XkyServerService extends Service
             $vendorData = [
                 'order_number' => $this->generateBillNo([
                     'type' => Vendor::Order_type,
+                    'login_type' => $user['login_type'],
                     'period' => date("Ym")
                 ]),
                 'code' => $data['code'] ?? "",
@@ -247,6 +257,7 @@ class U8XkyServerService extends Service
                 'easy_title' => $data['easy_title'] ?? "",
                 'category_code' => $data['category_code'] ?? "",
                 'category_code_title' => $data['category_code_title'] ?? "",
+                'login_type' => $user['login_type'] ?? "",
                 'crt_id' => $user['userid'],
                 'crt_time' => time(),
             ];
@@ -283,7 +294,7 @@ class U8XkyServerService extends Service
             DB::commit();
         } catch (\Throwable $exception) {
             DB::rollBack();
-            return [false, "创建供应商失败: " . $exception->getMessage()];
+            return [false, "编辑供应商失败: " . $exception->getMessage()];
         }
 
         return [true, ''];
@@ -391,6 +402,7 @@ class U8XkyServerService extends Service
                 // 使用 GROUP_CONCAT 将 title 合并，并起别名为 titles
                 DB::raw('GROUP_CONCAT(title SEPARATOR ",") as titles')
             ])
+            ->where('login_type', $user['login_type'])
             ->groupBy('userid', 'type')
             ->orderBy('type', 'desc'); // 或者根据你的需求排序
 
@@ -425,6 +437,7 @@ class U8XkyServerService extends Service
         if(! isset($data['userid'])) return [false, '人员id不能为空'];
 
         return [true, FieldData::where('type', $data['type'])
+            ->where('login_type', $user['login_type'])
             ->where('userid', $data['userid'])
             ->get()->toArray()];
     }
@@ -440,12 +453,13 @@ class U8XkyServerService extends Service
                 'userid' => $data['userid'],
                 'key' => $value['key'],
                 'title' => $value['title'],
+                'login_type' => $user['login_type']
             ];
         }
 
         try {
 
-            FieldData::where('userid', $data['userid'])->delete();
+            FieldData::where('userid', $data['userid'])->where('login_type', $user['login_type'])->delete();
 
             if(! empty($insert)) FieldData::insert($insert);
         } catch (\Throwable $exception) {
@@ -465,6 +479,7 @@ class U8XkyServerService extends Service
 
     public function ddEmployeeCommon($data,$user, $field = []){
         $model = DDEmployee::where('del_time',0)
+            ->where('login_type', $user['login_type'])
             ->orderby('id', 'desc');
 
         if(! empty($data['id'])) $model->where('id', $data['id']);
@@ -494,10 +509,11 @@ class U8XkyServerService extends Service
     {
         try {
             $field_list = [];
-            $employee = DDEmployee::where('userid', $user['userid'])->first();
+            $employee = DDEmployee::where('userid', $user['userid'])->where('login_type', $user['login_type'])->first();
             $qx = $employee['qx'] ?? 0;
             if(empty($qx)) {
                 $field_list = FieldData::where('userid', $user['userid'])
+                    ->where('login_type', $user['login_type'])
                     ->where('type', FieldData::STATE_ZERO)
                     ->pluck('key')
                     ->all();
@@ -784,373 +800,4 @@ class U8XkyServerService extends Service
 
         return [true, $list];
     }
-
-    //U8 存货新增到用友
-    public function inventoryAdd1($data, $user){
-        $inventory = Inventory::where('del_time', 0)
-            ->where('id', $data['id'])
-            ->first();
-        if(empty($inventory)) return [false, '存货记录不存在或已被删除'];
-        $inventory = $inventory->toArray();
-        if($inventory['status'] != Inventory::STATE_TWO) return [false, '存货记录未审核通过'];
-
-        $title = $inventory['title'];
-        $category_code = $inventory['category_code'];
-        if(! empty($data['code'])){
-            //用户传入
-            $no = $inventory['code'];
-            $flag_title = "重填";
-        }else{
-            //生成编码
-            list($status, $msg) = $this->generate('inventory','1005');
-            if(! $status) return [false, $msg];
-            $no = $msg;
-            $flag_title = "重试";
-        }
-
-        $inventoryData = [
-            'cInvCode' => $no,
-            'cInvName' => $title,
-            'cInvCCode' => $category_code,
-            'cInvStd' => $inventory['size'] ?? null, // 规格型号
-            'bSale'         => $inventory['bSale'], //内销
-            'bExpSale'        => $inventory['bExpSale'], //外销
-            'bPurchase'     => $inventory['bPurchase'], // 采购
-            'bSelf'         => $inventory['bSelf'], // 自制
-            'bComsume'      => $inventory['bComsume'], // 生产耗材
-            'iGroupType' => $inventory['unit_group_type'], // 计量单位组类别
-            'cGroupCode' => $inventory['unit_group_code'], //计量单位组
-            'cComUnitCode' => $inventory['unit_code'], // 主计量单位
-            'cShopUnit' => $inventory['unit_code'], // 零售计量单位
-            'iImpTaxRate' => $inventory['iImpTaxRate'], // 进项税率
-            'iTaxRate'      => $inventory['iTaxRate'], // 销项税率
-            'dSDate' => date("Y-m-d 00:00:00.000"), // 启用日期
-            'cEnterprise' => $inventory['vendor_code_title'] ?? null,
-            'iSupplyType' => '0', // 供应类型
-            'fConvertRate' => '1.0', // 转换因子
-            'bInTotalCost' => '1', // 成本累计否
-            'cPlanMethod' => 'R',
-            'cSRPolicy' => 'PE',
-            'bBomMain' => '0', // 允许BOM母件
-            'bBomSub' => '0', // 允许BOM子件
-            'bProductBill' => '0', // 允许生产订单
-            'iPlanDefault' => '1',
-            'iAllocatePrintDgt' => '4',
-            'bService' => '0',
-            'bAccessary' => '0',
-            'iInvAdvance' => '0.0',
-            'bInvQuality' => '0',
-            'bInvBatch' => '0',
-            'bInvEntrust' => '0',
-            'bInvOverStock' => '0',
-            'bFree1' => '0',
-            'bFree2' => '0',
-            'bInvType' => '0',
-            'bFree3' => '0',
-            'bFree4' => '0',
-            'bFree5' => '0',
-            'bFree6' => '0',
-            'bFree7' => '0',
-            'bFree8' => '0',
-            'bFree9' => '0',
-            'bFree10' => '0',
-            'cCreatePerson' => 'demo',
-            'cModifyPerson' => 'demo', // 变更
-            'dModifyDate' => date("Y-m-d H:i:s.000"),
-            'bFixExch' => '0',
-            'bTrack' => '0',
-            'bSerial' => '0',
-            'bBarCode' => '0',
-            'bSolitude' => '0',
-            'bSpecialties' => '0',
-            'bPropertyCheck' => '0',
-            'iRecipeBatch' => '0',
-            'bPromotSales' => '0',
-            'bPlanInv' => '0',
-            'bProxyForeign' => '0',
-            'bATOModel' => '0',
-            'bCheckItem' => '0',
-            'bPTOModel' => '0',
-            'bEquipment' => '0',
-            'bMPS' => '0',
-            'bROP' => '0',
-            'bRePlan' => '0',
-            'bBillUnite' => '0',
-            'bCutMantissa' => '0',
-            'bConfigFree1' => '0',
-            'bConfigFree2' => '0',
-            'bConfigFree3' => '0',
-            'bConfigFree4' => '0',
-            'bConfigFree5' => '0',
-            'bConfigFree6' => '0',
-            'bConfigFree7' => '0',
-            'bConfigFree8' => '0',
-            'bConfigFree9' => '0',
-            'bConfigFree10' => '0',
-            'bPeriodDT' => '0',
-            'bOutInvDT' => '0',
-            'bBackInvDT' => '0',
-            'bDTWarnInv' => '0',
-            'bImportMedicine' => '0',
-            'bFirstBusiMedicine' => '0',
-            'bForeExpland' => '0',
-            'bInvModel' => '0',
-            'bKCCutMantissa' => '0',
-            'bReceiptByDT' => '0',
-            'bCheckBSATP' => '0',
-            'bCheckFree1' => '0',
-            'bCheckFree2' => '0',
-            'bCheckFree3' => '0',
-            'bCheckFree4' => '0',
-            'bCheckFree5' => '0',
-            'bCheckFree6' => '0',
-            'bCheckFree7' => '0',
-            'bCheckFree8' => '0',
-            'bCheckFree9' => '0',
-            'bCheckFree10' => '0',
-            'iCheckATP' => '0',
-            'bPiece' => '0',
-            'bSrvItem' => '0',
-            'bSrvFittings' => '0',
-            'bSpecialOrder' => '0',
-            'bTrackSaleBill' => '0',
-            'bCheckBatch' => '0',
-            'bMngOldpart' => '0',
-        ];
-
-        $inventorySubData = [
-            'cInvSubCode' => $no,
-            'iSurenessType' => '1',
-            'bIsAttachFile' => '0',
-            'bInByProCheck' => '1',
-            'iRequireTrackStyle' => '0',
-            'iExpiratDateCalcu' => '0',
-            'iBOMExpandUnitType' => '1',
-            'iDrawType' => $inventory['iDrawType'] ?? 0, // 领用方式
-            'fInvCIQExch' => $inventory['customs_change_rate'] ?? 1, // 海关换算率
-            'bInvKeyPart' => '1',
-            'iAcceptEarlyDays' => '999',
-            'dInvCreateDatetime' => date("Y-m-d H:i:s.000"),
-            'bPUQuota' => '0',
-            'bInvROHS' => '0',
-            'bPrjMat' => '0',
-            'bInvAsset' => '0',
-            'bSrvProduct' => '0',
-            'iAcceptDelayDays' => '0',
-            'bSCkeyProjections' => '0',
-            'iSupplyPeriodType' => '1',
-            'iAvailabilityDate' => '1',
-            'bImport' => '0',
-            'bCheckSubitemCost' => '1',
-            'fRoundFactor' => '0.0',
-            'bConsiderFreeStock' => '1',
-            'bSuitRetail' => '0',
-            'bFeatureMatch' => '0',
-            'bProduceByFeatureAllocate' => '0',
-            'bMaintenance' => '0',
-            'iMaintenanceCycleUnit' => '0',
-            'bCoupon' => '0',
-            'bStoreCard' => '0',
-            'bProcessProduct' => '0',
-            'bProcessMaterial' => '0',
-            // 所有的价格自由项默认设为 '0'
-            'bPurPriceFree1' => '0', 'bPurPriceFree2' => '0', 'bPurPriceFree3' => '0', 'bPurPriceFree4' => '0', 'bPurPriceFree5' => '0',
-            'bPurPriceFree6' => '0', 'bPurPriceFree7' => '0', 'bPurPriceFree8' => '0', 'bPurPriceFree9' => '0', 'bPurPriceFree10' => '0',
-            'bOMPriceFree1' => '0', 'bOMPriceFree2' => '0', 'bOMPriceFree3' => '0', 'bOMPriceFree4' => '0', 'bOMPriceFree5' => '0',
-            'bOMPriceFree6' => '0', 'bOMPriceFree7' => '0', 'bOMPriceFree8' => '0', 'bOMPriceFree9' => '0', 'bOMPriceFree10' => '0',
-            'bSalePriceFree1' => '0', 'bSalePriceFree2' => '0', 'bSalePriceFree3' => '0', 'bSalePriceFree4' => '0', 'bSalePriceFree5' => '0',
-            'bSalePriceFree6' => '0', 'bSalePriceFree7' => '0', 'bSalePriceFree8' => '0', 'bSalePriceFree9' => '0', 'bSalePriceFree10' => '0',
-            // 所有的控制自由项默认设为 '0'
-            'bControlFreeRange1' => '0', 'bControlFreeRange2' => '0', 'bControlFreeRange3' => '0', 'bControlFreeRange4' => '0', 'bControlFreeRange5' => '0',
-            'bControlFreeRange6' => '0', 'bControlFreeRange7' => '0', 'bControlFreeRange8' => '0', 'bControlFreeRange9' => '0', 'bControlFreeRange10' => '0',
-            // 所有的批次属性默认设为 '0'
-            'bBatchProperty1' => '0', 'bBatchProperty2' => '0', 'bBatchProperty3' => '0', 'bBatchProperty4' => '0', 'bBatchProperty5' => '0',
-            'bBatchProperty6' => '0', 'bBatchProperty7' => '0', 'bBatchProperty8' => '0', 'bBatchProperty9' => '0', 'bBatchProperty10' => '0',
-            'bBondedInv' => '0',
-            'bBatchCreate' => '0',
-        ];
-
-        try {
-            DB::connection('sqlsrv')->beginTransaction();
-
-            $exists = DB::connection('sqlsrv')
-                ->table('Inventory')
-                ->where('cInvCode', $inventoryData['cInvCode'])
-                ->lockForUpdate() // 锁定该行，防止并发冲突
-                ->exists();
-
-            if ($exists) return [false, '存货编码已存在，请' . $flag_title];
-
-            DB::connection('sqlsrv')->table('Inventory')->insert($inventoryData);
-            DB::connection('sqlsrv')->table('Inventory_sub')->insert($inventorySubData);
-
-            DB::connection('sqlsrv')->commit();
-        } catch (\Throwable $exception) {
-            DB::connection('sqlsrv')->rollBack();
-
-            return [false, "创建用友失败: " . $exception->getMessage()];
-        }
-
-        return [true, ''];
-    }
-
-    //U8 供应商新增
-    public function vendorAdd1($data, $user){
-        $vendor = Vendor::where('del_time', 0)
-            ->where('id', $data['id'])
-            ->first();
-        if(empty($vendor)) return [false, '供应商记录不存在或已被删除'];
-        $vendor = $vendor->toArray();
-        if($vendor['status'] != Vendor::STATE_TWO) return [false, '供应商记录未审核通过'];
-
-        if(! empty($vendor['code'])){
-            //用户传入
-            $no = $vendor['code'];
-            $flag_title = "重填";
-        }else{
-            //生成编码
-            list($status, $msg) = $this->generate('vendor');
-            if(! $status) return [false, $msg];
-            $no = $msg;
-            $flag_title = "重试";
-        }
-
-        $vendorData = [
-            'cVenCode' => $no,
-            'cVenName' => $vendor['title'],
-            'cVenAbbName' => $vendor['easy_title'],
-            'cVCCode' => $vendor['category_code'],
-            'dVenDevDate' => date("Y-m-d 00:00:00.000"),
-            'iVenDisRate' => '0.0',
-            'iVenCreLine' => '0.0',
-            'iVenCreDate' => '0',
-            'cVenHeadCode' => $no,
-            'iAPMoney' => '0.0',
-            'iLastMoney' => '0.0',
-            'iLRMoney' => '0.0',
-            'iFrequency' => '0',
-            'bVenTax' => '1',
-            'cCreatePerson' => 'demo',
-            'cModifyPerson' => 'demo',
-            'dModifyDate' => date("Y-m-d H:i:s.000"),
-            'iGradeABC' => '-1',
-            'bLicenceDate' => '0',
-            'bBusinessDate' => '0',
-            'bProxyDate' => '0',
-            'bPassGMP' => '0',
-            'bVenCargo' => '1', // 采购
-            'bProxyForeign' => '0', // 委外
-            'bVenService' => '0', // 服务
-            'bVenOverseas' => '0', // 国外
-            'cVenExch_name' => '人民币',
-            'iVenGSPType' => '0',
-            'iVenGSPAuth' => '-1',
-            'bVenAccPeriodMng' => '0',
-            'bVenHomeBranch' => '0',
-            'dVenCreateDatetime' => date("Y-m-d H:i:s.000"),
-            'bIsVenAttachFile' => '0',
-            'bRetail' => '0',
-        ];
-
-        try {
-            DB::connection('sqlsrv')->beginTransaction();
-
-            $exists = DB::connection('sqlsrv')
-                ->table('Vendor')
-                ->where('cVenCode', $vendorData['cVenCode'])
-                ->lockForUpdate() // 锁定该行，防止并发冲突
-                ->exists();
-
-            if ($exists) return [false, '供应商编码已存在，请' . $flag_title];
-
-            DB::connection('sqlsrv')->table('Vendor')->insert($vendorData);
-
-            DB::connection('sqlsrv')->commit();
-
-        } catch (\Throwable $exception) {
-            DB::connection('sqlsrv')->rollBack();
-
-            return [false, "创建供应商失败: " . $exception->getMessage()];
-        }
-
-        return [true, ''];
-    }
-
-    // 生成编码
-    public function generate($type, $classCode = "")
-    {
-        try {
-            // 1. 确定对象映射
-            $cardNumber = ($type === 'inventory') ? 'inventory' : 'Vendor';
-            $cardNumber_name = ($type === 'inventory') ? '存货' : '供应商';
-            $table = ($type === 'inventory') ? 'Inventory' : 'Vendor';
-            $codeField = ($type === 'inventory') ? 'cInvCode' : 'cVenCode';
-
-            // 2. 获取 U8 规则定义
-            $rule = DB::connection('sqlsrv')->table('VoucherNumber')
-                ->where('CardNumber', $cardNumber)
-                ->first();
-
-            if (!$rule) return [false, "未找到 {$cardNumber_name} 的规则定义"];
-
-            /**
-             * 3. 动态解析前缀 (Prefix1, Prefix2, Prefix3)
-             * U8 的规则通常存放在 PrefixRule 或 Prefix 字段中
-             */
-            $prefix = "";
-            for ($i = 1; $i <= 3; $i++) {
-                $ruleField = "Prefix{$i}Rule";
-                $valField = "Prefix{$i}";
-
-                // 检查规则描述
-                $ruleDesc = $rule->$ruleField ?? ''; // 例如 "存货分类编码" 或 "GYS"
-                $staticVal = $rule->$valField ?? '';
-
-                if (str_contains($ruleDesc, '分类') || str_contains($staticVal, '分类')) {
-                    // 如果规则提到“分类”，则填入传入的分类编码
-                    $prefix .= $classCode;
-                } elseif (!empty($ruleDesc)) {
-                    // 如果规则是具体的字符（如 "GYS"），直接拼接
-                    $prefix .= $ruleDesc;
-                } elseif (!empty($staticVal) && $staticVal !== '手工输入' && $staticVal !== '存货分类编码') {
-                    // 如果静态值不是提示语，则作为前缀
-                    $prefix .= $staticVal;
-                }
-            }
-
-            // 4. 获取流水号配置 (Glide)
-            $glideLen = $rule->GlideLen > 0 ? $rule->GlideLen : 4;
-            $startNum = $rule->iStartNumber ?? 1;
-
-            // 5. 查找当前最大编码
-            $expectedLen = strlen($prefix) + $glideLen;
-
-            $lastCode = DB::connection('sqlsrv')->table($table)
-                ->where($codeField, 'like', $prefix . '%')
-                ->whereRaw("LEN($codeField) = $expectedLen")
-                ->orderBy($codeField, 'desc')
-                ->value($codeField);
-
-            // 6. 生成编码
-            if (!$lastCode) {
-                // 初始：前缀 + 起始值补零
-                $finalCode = $prefix . str_pad($startNum, $glideLen, '0', STR_PAD_LEFT);
-            } else {
-                // 截取流水号自增
-                $lastSerial = substr($lastCode, -$glideLen);
-                $nextSerial = ++$lastSerial;
-
-                // 溢出检查
-                if (strlen($nextSerial) > $glideLen) {
-                    return [false, "流水号已溢出"];
-                }
-                $finalCode = $prefix . str_pad($nextSerial, $glideLen, '0', STR_PAD_LEFT);
-            }
-
-            return [true, $finalCode];
-
-        } catch (\Throwable $e) {
-            return [false, "生成失败: " . $e->getMessage()];
-        }
-    }
 }