Commit Graph

113 Commits

Author SHA1 Message Date
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 52a96de545 新购入库模块代码修改 2023-12-23 11:45:38 +08:00
bns_han 2380d97848 后台-退料申请与审核 2023-12-23 10:24:00 +08:00
syruan 86acb6308b mapper修改 2023-12-22 21:23:00 +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
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
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
bns_han d10f4ab05a 移动-退料审核修改 2023-12-21 14:14:05 +08:00
bns_han 938350aa7a Merge remote-tracking branch 'origin/dev' into dev 2023-12-21 13:31:39 +08:00
bns_han b13f6e787f 移动-退料审核修改 2023-12-21 13:31:29 +08:00
cwchen f689436364 大屏添加接口 2023-12-21 13:26:41 +08:00
syruan 2f6f9ec862 申领任务删除 2023-12-21 12:04:38 +08:00
bns_han aa8d460a0a 移动-退料审核修改 2023-12-21 10:39:12 +08:00
gmhao 79deb5a9d9 Merge remote-tracking branch 'origin/dev' into dev 2023-12-20 20:35:55 +08:00
gmhao c568a0d9c4 修改 2023-12-20 20:35:28 +08:00
dingjie 810b8b926a 修改类型图片 2023-12-20 20:35:03 +08:00
dingjie a729039137 仓储管理模块修改 2023-12-20 20:28:42 +08:00
dingjie 4abf71e754 Merge remote-tracking branch 'origin/dev' into dev 2023-12-20 20:02:56 +08:00
dingjie f6566e60f8 报错修改 2023-12-20 20:02:45 +08:00
bns_han d543013f30 Merge remote-tracking branch 'origin/dev' into dev 2023-12-20 19:47:35 +08:00
bns_han a94970c615 移动-退料申请修改 2023-12-20 19:47:26 +08:00
dingjie 6d2796d22b Merge remote-tracking branch 'origin/dev' into dev 2023-12-20 18:49:18 +08:00
dingjie 79c261b235 标签绑定新增 2023-12-20 18:49:09 +08:00
bns_han 5ecdc9261a Merge remote-tracking branch 'origin/dev' into dev 2023-12-20 17:04:42 +08:00
bns_han 2270002805 移动-退料申请请求方式修改 2023-12-20 17:04:29 +08:00
liuchuan fc0d7cac8a 后台维修代码提交 2023-12-20 15:14:55 +08:00
bns_han 50f8c0b524 Merge remote-tracking branch 'origin/dev' into dev 2023-12-20 14:41:03 +08:00
bns_han e5cbbafb14 移动-退料申请详情请求方式修改 2023-12-20 14:39:09 +08:00
cwchen 2353347114 大屏接口修改 2023-12-20 13:58:18 +08:00
cwchen cd210bcebe 大屏-常量修改 2023-12-20 13:16:58 +08:00
gmhao afdddd648d 排序 资产属性 2023-12-19 10:09:47 +08:00
sliang b6f46c6b4f 工机具管理-库管员配置;维修班配置 2023-12-19 09:58:39 +08:00
syruan 86575d4056 领料申请逻辑完善 2023-12-19 04:17:18 +08:00
gmhao ba61838d2c Merge remote-tracking branch 'origin/dev' into dev 2023-12-19 01:48:54 +08:00