Commit Graph

458 Commits

Author SHA1 Message Date
BianLzhaoMin f6c1bdb1c7 冲突合并 2024-05-07 16:38:53 +08:00
liang.chao 8b5519223f 测试问题bug修改 2024-05-07 16:29:36 +08:00
mashuai 75d2b02422 bug 2024-05-06 18:20:45 +08:00
liang.chao 25ad01ce71 bug修改提交 2024-05-06 17:59:30 +08:00
liang.chao 0cce5cc793 退料审核代码提交 2024-05-06 17:07:03 +08:00
15856 40736e1c85 催办,退料报废,维修报废,预报废审核,报废审核 2024-05-06 10:35:08 +08:00
mashuai 4c8a65cd54 大屏 2024-05-06 10:04:58 +08:00
BianLzhaoMin 688599a5b0 宁夏 冲突合并 2024-05-06 09:48:15 +08:00
liang.chao 52745e9a4e 退料审核代码提交 2024-05-06 09:42:49 +08:00
15856 834faeee43 Merge remote-tracking branch 'origin/dev-cq-bug' into dev 2024-04-30 17:51:44 +08:00
liang.chao bc8420e094 bug修改提交 2024-04-30 16:43:40 +08:00
mashuai 1ed94a6706 bug 2024-04-30 15:14:27 +08:00
liang.chao 1030c78305 app领料申请详情bug提交 2024-04-30 14:09:40 +08:00
15856 1419b8c32d Merge remote-tracking branch 'origin/dev-cq-bug' into dev 2024-04-30 13:11:10 +08:00
mashuai f23b73106a bug 2024-04-30 11:29:00 +08:00
liang.chao 6b002958d6 Merge remote-tracking branch 'origin/dev' into dev 2024-04-30 11:23:54 +08:00
liang.chao ffe7c67c6f 重庆领料审核修改后无数据bug 2024-04-30 11:23:49 +08:00
15856 bbf5d988f3 Merge remote-tracking branch 'origin/dev-cq-bug' into dev 2024-04-30 10:26:55 +08:00
liang.chao 763c003c34 新购验收查询接口添加 2024-04-30 09:09:34 +08:00
mashuai d1ed28a088 bug 2024-04-29 17:42:02 +08:00
mashuai d58c1b788d bug 2024-04-29 16:52:51 +08:00
mashuai 4f9cb5e37e 宁夏大屏二级页面 2024-04-29 14:38:15 +08:00
15856 bad5c11bdc Merge remote-tracking branch 'origin/dev' into dev-cq-bug 2024-04-28 16:41:10 +08:00
15856 660d90550a Bug修复 2024-04-28 16:23:43 +08:00
liang.chao c2aaa44f1b app联调代码提交 2024-04-28 16:16:29 +08:00
liang.chao bf0992137d 成套机具和退料申请当前在用量代码提交 2024-04-26 17:00:29 +08:00
15856 5051b6ae92 Merge remote-tracking branch 'origin/dev-cq-bug' into dev 2024-04-25 16:47:32 +08:00
15856 14822542ce Bug修复 2024-04-25 16:43:56 +08:00
15856 090fc6c17d Merge remote-tracking branch 'origin/dev-cq-bug' into dev 2024-04-25 16:42:58 +08:00
liang.chao d293399415 成套机具代码提交 2024-04-25 16:30:04 +08:00
mashuai 0e681358a9 bug 2024-04-25 15:52:01 +08:00
mashuai ff893914d9 bug修改 2024-04-25 14:51:11 +08:00
mashuai 62aeaf6cfd bug修改 2024-04-25 13:08:53 +08:00
liang.chao 3ac38557af 成套机具代码提交 2024-04-24 17:59:17 +08:00
liang.chao 82e8a6db4a 退料审核代码提交 2024-04-24 14:05:18 +08:00
liang.chao 3fedcde616 sql提交 2024-04-23 09:35:44 +08:00
liang.chao 62f2330ffb 成套机具代码提交 2024-04-23 09:19:37 +08:00
csyue f94470a742 测试app问题项修改 2024-04-22 18:58:46 +08:00
liang.chao b4c3540fb5 退料审核代码提交 2024-04-22 11:19:06 +08:00
liang.chao b1fee78651 bug修改 2024-04-20 17:29:05 +08:00
mashuai e9deecdee5 Merge remote-tracking branch 'origin/dev' into dev 2024-04-20 16:58:45 +08:00
mashuai f1a3e8839b bug 2024-04-20 16:58:38 +08:00
hayu c180ad60e7 测试问题修改 2024-04-20 16:58:15 +08:00
mashuai 07c77c5ad3 bug 2024-04-20 16:01:30 +08:00
sxu ff93691d19 回滚错误提交 2024-04-20 14:29:59 +08:00
sxu 00a634cd0b fix conflict 2024-04-20 14:21:17 +08:00
sxu 7126f3e744 往来单位状态 2024-04-20 14:18:17 +08:00
sxu 43ecf26853 解绑问题 2024-04-20 14:00:22 +08:00
mashuai 264bd77a41 bug 2024-04-20 13:55:53 +08:00
sxu f609921ada 标签绑定历史的排序问题 2024-04-20 13:03:41 +08:00
hayu 54cef0f824 任务单号获取修改 2024-04-20 11:23:08 +08:00
liang.chao 6207d42ee5 重庆机具问题提交 2024-04-20 10:42:49 +08:00
mashuai 9e9fb2da60 名称重复性校验 2024-04-18 18:14:09 +08:00
mashuai 4dc7d58e72 fix 2024-04-18 17:27:47 +08:00
liang.chao 8ca8b57e9d 退料审核代码提交 2024-04-17 11:11:55 +08:00
hayu 82a5bf2cee 往来单位列表创建时间倒叙 2024-04-17 10:45:01 +08:00
mashuai b0e00b40a3 FIX 2024-04-17 10:38:02 +08:00
liang.chao 9a7e4f0dc2 领料管理页面展示bug 2024-04-17 10:26:01 +08:00
liang.chao 77c6616c64 退料审核代码提交 2024-04-15 16:42:26 +08:00
liang.chao 09dd56414a 退料接收撤回代码提交 2024-04-15 16:03:44 +08:00
csyue f17a656374 int类型变量命名 2024-04-15 15:42:23 +08:00
liang.chao 1ecf314a2a bug修改 2024-04-12 17:18:48 +08:00
liang.chao 2ee6e711c1 bug修改 2024-04-11 18:00:57 +08:00
mashuai d98daff25c fix:模糊查询,分页功能优化 2024-04-11 13:06:32 +08:00
hayu 1784251cf3 功能优化 2024-04-11 10:40:04 +08:00
hayu 5da7fcdbad 功能优化 2024-04-10 18:24:20 +08:00
liang.chao 93139ffd5a bug及退料接收代码提交 2024-04-10 17:48:09 +08:00
mashuai 5c1bf635a8 fix 2024-04-10 16:08:19 +08:00
syruan 1dbfb3f562 优化import引用,新增重庆领料确认接口 2024-04-07 13:44:14 +08:00
liang.chao e0b9cd2ab5 退料接收后台代码提交 2024-04-07 09:43:24 +08:00
liang.chao 902c5015ac bug提交 2024-04-03 17:20:33 +08:00
liang.chao 8592abb9b4 Merge remote-tracking branch 'origin/dev' into dev 2024-04-03 14:08:29 +08:00
liang.chao c96a108d89 退料申请表数据问题修改 2024-04-03 14:08:22 +08:00
hayu dba22d1477 厂家规格型号添加及机具仓储状态查询修改 2024-04-03 14:07:26 +08:00
liang.chao 6fd2b89fe8 退料申请表数据问题修改 2024-04-02 15:23:56 +08:00
liang.chao d77b56c106 退料申请表数据问题修改 2024-04-02 15:20:12 +08:00
liang.chao 111ac4ab8f Merge remote-tracking branch 'origin/dev' into dev 2024-04-02 13:58:59 +08:00
liang.chao 1c7b74efc9 退料申请表数据问题修改 2024-04-02 13:57:55 +08:00
hayu e1e8a47e06 问题修复 2024-04-02 13:57:31 +08:00
liang.chao 6b029e51ef 退料申请表数据问题修改 2024-04-01 15:43:18 +08:00
liang.chao 5fd5f36411 退料申请表数据问题修改 2024-04-01 10:22:28 +08:00
liang.chao 026598a082 领料出库代码提交 2024-03-29 17:48:02 +08:00
liang.chao 759a4e22ff 领料出库代码提交 2024-03-28 18:11:48 +08:00
liang.chao 0f4ae97bad 退料出库代码提交 2024-03-27 18:15:32 +08:00
syruan 518bb466e6 领料出库接口 2024-03-25 17:26:10 +08:00
liang.chao f42e2210ba bug修改 2024-03-25 15:24:02 +08:00
hayu c96e26c635 功能修复 2024-03-22 18:00:57 +08:00
liang.chao 3e32f0087d bug修改 2024-03-22 17:38:48 +08:00
syruan 5a01e0bb4d 重庆机具退料新接口,优化代码结构 2024-03-22 15:23:57 +08:00
liang.chao e2ce07dbd7 退料申请表数据问题修改 2024-03-21 11:29:39 +08:00
liang.chao be12de782c 退料申请表数据问题修改 2024-03-20 13:24:45 +08:00
syruan 1efd3230f8 修改 2024-03-19 17:06:58 +08:00
liang.chao 56292de5dd 退料申请表数据问题修改 2024-03-18 16:04:29 +08:00
syruan 78b6f03bb3 领料审批流 2024-03-18 15:30:37 +08:00
bns_han 5b4914da1d 功能完善 2024-03-18 14:04:28 +08:00
liang.chao e31aaad942 退料申请表数据问题修改 2024-03-16 18:44:04 +08:00
liang.chao 270d3ae2f8 重庆领料申请代码提交 2024-03-16 15:33:49 +08:00
1539530615@qq.com beb33397a8 问题修改 2024-03-15 18:00:23 +08:00
syruan 45d26cf0d4 逻辑优化,魔法值抽取,NULL异常处理,冗余装箱去除 2024-03-15 16:40:56 +08:00
syruan ca1980fdd6 优化导入,格式化时间,新增删除接口 2024-03-14 13:36:51 +08:00