Commit Graph

170 Commits

Author SHA1 Message Date
gmhao 19a23f3bf8 新增校验 2023-12-23 17:35:43 +08:00
gmhao e8faf72541 新增校验 2023-12-23 17:02:17 +08:00
syruan 7b0c928309 修正判断逻辑 2023-12-23 16:48:05 +08:00
dingjie c6c96dec3c Merge remote-tracking branch 'origin/dev' into dev 2023-12-23 15:58:09 +08:00
dingjie d4a943ce46 新购入库模块代码修改 2023-12-23 15:57:50 +08:00
bns_han a22ee17c23 后台-退料申请与审核 2023-12-23 15:55:22 +08:00
bns_han 49e1b410b6 后台-退料申请与审核 2023-12-23 15:36:12 +08:00
syruan b87c914739 maCode修正 2023-12-23 15:24:52 +08:00
dingjie 8857257ec1 Merge remote-tracking branch 'origin/dev' into dev 2023-12-23 14:32:05 +08:00
dingjie c1075c9320 新购入库模块代码修改 2023-12-23 14:31:54 +08:00
syruan eab80f6156 SQL异常处理 2023-12-23 13:33:03 +08:00
dingjie d3f7052535 Merge remote-tracking branch 'origin/dev' into dev 2023-12-23 11:45:53 +08:00
dingjie 52a96de545 新购入库模块代码修改 2023-12-23 11:45:38 +08:00
bns_han 2265d0cebc 后台-退料申请与审核 2023-12-23 10:58:55 +08:00
bns_han 2380d97848 后台-退料申请与审核 2023-12-23 10:24:00 +08:00
syruan 76cdd524f9 Merge remote-tracking branch 'devVPN/dev' into dev 2023-12-22 21:23:29 +08:00
syruan 86acb6308b mapper修改 2023-12-22 21:23:00 +08:00
dingjie 35c6862e01 Merge remote-tracking branch 'origin/dev' into dev 2023-12-22 21:08:09 +08:00
dingjie 439536142a 新购入库模块代码修改 2023-12-22 21:07:56 +08:00
syruan 7f73c243f5 支持工程与往来单位及协议修改 2023-12-22 20:27:35 +08:00
dingjie a18aff4d23 新购模块代码修改 2023-12-22 19:14:59 +08:00
gmhao 689abd905d 设备标签二改 新增下拉框 2023-12-22 18:49:20 +08:00
liuchuan 0abdca2751 后台代码提交 2023-12-22 17:59:58 +08:00
gmhao 2495ce88f5 设备标签二改 新增下拉框 2023-12-22 17:07:32 +08:00
syruan 04d79ac8b0 完善领料申请修改逻辑 2023-12-22 16:24:25 +08:00
cwchen d51ec0bbf3 统一下拉选-设备树添加company_id 2023-12-22 16:17:57 +08:00
bns_han b71ca1e957 后台-退料申请与审核 2023-12-22 15:57:59 +08:00
bns_han 5275483a0e 后台-退料申请与审核 2023-12-22 15:57:10 +08:00
syruan 3e1839ce64 合并分支,处理冲突异常 2023-12-22 15:21:18 +08:00
syruan bf0c462853 删除领料明细接口提交 2023-12-22 15:10:27 +08:00
sliang 6d642b7edf 获取领料申请-详情列表 2023-12-22 14:48:58 +08:00
bns_han 7f1e051e42 后台-退料申请与审核 2023-12-22 14:13:53 +08:00
gmhao 54eed165b5 设备标签缺陷 2023-12-22 13:56:28 +08:00
cwchen 54a6c380d0 修试入库 2023-12-22 13:43:58 +08:00
cwchen f92c7f4489 修试入库 2023-12-22 13:40:46 +08:00
cwchen 1bbfc1dd73 修试入库 2023-12-22 12:32:01 +08:00
cwchen 308d8e343c 修试入库 2023-12-22 11:21:10 +08:00
bns_han 8d7e961f80 后台-退料申请与审核 2023-12-22 11:05:45 +08:00
cwchen f7ef5c629e 修试入库修改 2023-12-22 10:03:23 +08:00
bns_han a4850f1d40 后台-退料申请与审核 2023-12-22 00:16:53 +08:00
bns_han a428cf7658 后台-退料申请与审核 2023-12-22 00:13:15 +08:00
dingjie 2380e9a695 配置文件修改 2023-12-21 20:29:12 +08:00
dingjie 1e77850c42 Merge remote-tracking branch 'origin/dev' into dev 2023-12-21 20:28:46 +08:00
dingjie 881b8b80df 新购验收模块 2023-12-21 20:28:01 +08:00
liuchuan 04bb0c890f 后台维修代码提交 2023-12-21 20:24:45 +08:00
bns_han 5564d3d391 后台-退料申请 2023-12-21 20:17:36 +08:00
sliang b19a375a4b 工机具管理-库管员配置;维修班配置 2023-12-21 18:35:36 +08:00
gmhao 3a5e6f503a 修改 2023-12-21 18:09:56 +08:00
cwchen 31ffacfc04 下拉选-设备类型树修改 2023-12-21 16:34:28 +08:00
cwchen 7d27c34072 下拉选修改 2023-12-21 16:24:46 +08:00