Commit Graph

339 Commits

Author SHA1 Message Date
liang.chao 50de01d74d 测试问题提交 2024-06-25 10:21:46 +08:00
mashuai cf317042c2 综合查询分开展示 2024-06-24 10:13:06 +08:00
liang.chao 4667e836b8 成套机具修改 2024-06-21 17:07:53 +08:00
csyue 57daec7a73 app增加报废任务列表 2024-06-21 08:57:03 +08:00
hayu 78f99ec50d 新购测试问题修改 2024-06-20 14:04:13 +08:00
mashuai f072ab95b8 退料审核bug 2024-06-19 11:34:47 +08:00
mashuai 4a8042b267 退料审核bug 2024-06-18 16:14:53 +08:00
15856 2aed98e19c 首页展示问题优化 2024-06-18 15:21:55 +08:00
mashuai 7be2995a04 退料审核bug 2024-06-18 14:07:30 +08:00
mashuai 4a0741161e 退料审核bug 2024-06-18 13:44:23 +08:00
15856 5da3ca0b18 文件上传修改 2024-06-17 17:12:22 +08:00
csyue da207e3298 宁夏测试问题修改 2024-06-17 14:43:54 +08:00
mashuai 2534328388 领料bug 2024-06-17 13:37:06 +08:00
15856 21b5304490 领料催办任务 2024-06-14 17:33:27 +08:00
15856 fe70c92210 在任务表中对领料和退料创建人进行统一存userId,对以前的逻辑进行修改 2024-06-14 13:48:18 +08:00
15856 bb2469f184 报废原因和报废图片回显问题 2024-06-14 09:18:06 +08:00
mashuai 8292dacb38 乱码bug 2024-06-13 14:55:58 +08:00
mashuai 7e3675a42a 乱码bug 2024-06-13 14:39:50 +08:00
15856 0190782966 报废原因和报废图片回显问题 2024-06-13 11:29:09 +08:00
mashuai 4b35f59c57 入库盘点 2024-06-12 18:13:25 +08:00
mashuai 078f3a6241 入库盘点 2024-06-12 13:40:05 +08:00
csyue f4ac334d17 试运行问题修改 2024-06-11 09:38:16 +08:00
hayu 6e6694eb27 新购流程及综合查询修改 2024-06-07 17:12:11 +08:00
hayu d6577e9a6e 修改 2024-06-07 14:42:33 +08:00
hayu 75895eaa56 新购流程修改 2024-06-07 09:58:35 +08:00
hayu c47cfa28d6 Merge remote-tracking branch 'origin/dev-nx' into dev-nx
# Conflicts:
#	sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java
#	sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java
2024-06-07 09:53:59 +08:00
csyue 8c3665d599 试运行问题修改 2024-06-05 17:48:30 +08:00
csyue 2a0556f200 试运行问题修改 2024-06-05 15:44:39 +08:00
csyue 860987874e 宁夏试运行问题修改 2024-06-05 13:15:29 +08:00
hayu facf7ffebc Merge remote-tracking branch 'origin/dev-nx' into dev-nx
# Conflicts:
#	sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
2024-06-05 09:13:30 +08:00
csyue 8c120a3002 宁夏试运行问题修改 2024-06-04 18:10:42 +08:00
hayu dd9d4d5c20 Merge remote-tracking branch 'origin/dev-nx' into dev-nx
# Conflicts:
#	sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
2024-06-04 09:12:04 +08:00
csyue 4201951630 宁夏试运行问题修改 2024-06-03 18:45:24 +08:00
hayu f4d2a37cfe 新购流程修改 2024-05-31 13:09:02 +08:00
csyue 22b6be9f45 Merge remote-tracking branch 'origin/dev-nx' into dev-nx 2024-05-30 16:21:24 +08:00
csyue e84f1c4b31 测试问题项修改 2024-05-30 16:20:20 +08:00
mashuai 7096390f0c 配置更改 2024-05-30 15:20:28 +08:00
csyue f1584484ee 测试问题项修改 2024-05-30 13:57:07 +08:00
mashuai 6b89c6f089 盘点入库详情 2024-05-28 17:08:12 +08:00
mashuai 3ebb67dd24 bug 2024-05-27 17:40:18 +08:00
mashuai c45eb9c65b 盘点入库 2024-05-25 16:03:46 +08:00
mashuai f8dd3dfeba bug 2024-05-24 14:55:07 +08:00
liang.chao 876e346a7e 报废导出和查询bug代码提交 2024-05-16 17:59:05 +08:00
mashuai 8f71e98681 bug 2024-05-15 15:58:46 +08:00
liang.chao ec1c6141b1 退料审核代码提交 2024-05-15 13:22:40 +08:00
赵福海 c69007a1b9 Merge remote-tracking branch 'origin/dev-nx' into dev-nx 2024-05-15 10:13:41 +08:00
赵福海 5bc911baf8 待报废单号问题修复 2024-05-15 10:13:31 +08:00
mashuai 7426badbf3 bug-预报废审核列表 2024-05-15 09:15:42 +08:00
mashuai 2a8e060652 bug 2024-05-14 18:02:58 +08:00
liang.chao c20ea17df3 宁夏流程及数据权限修改 2024-05-14 17:51:35 +08:00