Commit Graph

2107 Commits

Author SHA1 Message Date
BianLzhaoMin 8be2a24957 代码优化 2024-09-20 14:24:39 +08:00
liang.chao 26ceb64cde app退料盛情状态修改 2024-09-19 17:39:10 +08:00
liang.chao b70753ec60 Merge remote-tracking branch 'origin/dev-nx' into dev-nx 2024-09-19 16:22:32 +08:00
liang.chao c6aeeb9e81 app退料盛情状态修改 2024-09-19 16:22:27 +08:00
BianLzhaoMin 0511da6b4e 代码优化 2024-09-19 15:55:02 +08:00
BianLzhaoMin 9ec44744da Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-09-19 13:22:44 +08:00
BianLzhaoMin 3bd1249b07 大屏问题调试 2024-09-19 13:22:34 +08:00
liang.chao f5060f4a7b 宁夏NGINX配置 2024-09-14 14:22:44 +08:00
liang.chao 091dd75247 线上sql报错修改 2024-09-14 11:14:19 +08:00
liang.chao da26589e8d 线上sql报错修改 2024-09-14 10:41:59 +08:00
liang.chao ffdbcd019e Merge remote-tracking branch 'origin/dev-nx' into dev-nx 2024-09-13 14:35:43 +08:00
liang.chao 1d35c72d4b Merge remote-tracking branch 'origin/dev-nx' into dev-nx 2024-09-13 14:30:13 +08:00
liang.chao d8dead113a 重庆结算驳回功能开发 2024-09-13 14:30:06 +08:00
wcy 11362d1f0b 审核驳回功能 2024-09-13 14:29:58 +08:00
BianLzhaoMin bc382854f1 代码优化 2024-09-12 13:55:08 +08:00
BianLzhaoMin ad676e57dc 打包配置优化 2024-09-12 11:50:05 +08:00
BianLzhaoMin ad70d31465 修改打包配置 为后续ng重新配置作准备 2024-09-12 10:19:26 +08:00
BianLzhaoMin 43aa148f9d 代码优化 2024-09-12 10:05:49 +08:00
BianLzhaoMin 3135a41ec2 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-09-12 09:53:03 +08:00
BianLzhaoMin 9ee0268138 页面样式调整 2024-09-12 09:53:00 +08:00
liang.chao 3a1d073a68 生产问题提交 2024-09-11 11:19:35 +08:00
BianLzhaoMin e43f8d4915 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-09-09 14:44:39 +08:00
BianLzhaoMin 4af2fdeefe 代码优化 2024-09-09 14:44:36 +08:00
liang.chao 32045be221 生产环境配置文件新增 2024-09-09 13:02:54 +08:00
liang.chao 4d7feb8ea3 字典表更新 2024-09-06 16:15:24 +08:00
liang.chao 9811e4bc1e 大屏二级页面模糊查询 2024-09-05 18:26:00 +08:00
liang.chao 35e264680c 测试bug提交 2024-09-05 16:54:22 +08:00
liang.chao 8cc289e502 标段工程省份字段未更新 2024-09-04 13:55:32 +08:00
BianLzhaoMin f97ccbc0bc Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-08-27 18:09:36 +08:00
BianLzhaoMin 1eab23e306 绑定编码问题优化 2024-08-27 18:09:30 +08:00
sxu 1969c65c6c Revert "退料接收时,检查结算表拿到待退料数量,防止多退"
This reverts commit 72d67f1b66.
2024-08-27 18:00:18 +08:00
sxu 72d67f1b66 退料接收时,检查结算表拿到待退料数量,防止多退 2024-08-27 17:21:42 +08:00
sxu d472a43641 Revert "退料接收时,检查结算表拿到待退料数量,防止多退"
This reverts commit 76a98b70ea.
2024-08-27 16:27:29 +08:00
sxu 20dd458628 去掉排序 2024-08-27 16:02:25 +08:00
sxu 76a98b70ea 退料接收时,检查结算表拿到待退料数量,防止多退 2024-08-27 16:00:59 +08:00
liang.chao 73ca957a7c Merge remote-tracking branch 'origin/dev-nx' into dev-nx 2024-08-27 15:54:01 +08:00
liang.chao 75fdd15182 设备停留点增加经纬度 2024-08-27 15:53:56 +08:00
BianLzhaoMin 212095bea9 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-08-27 15:16:20 +08:00
BianLzhaoMin 74dec8db3a iot行程问题完善 2024-08-27 15:16:13 +08:00
liang.chao 20ead6e3a6 编码设备库存查询修改 2024-08-27 10:23:37 +08:00
liang.chao 51452ce3a3 Merge remote-tracking branch 'origin/dev-nx' into dev-nx 2024-08-27 09:40:40 +08:00
liang.chao 4c08156676 增加省份后地址字段 2024-08-27 09:40:23 +08:00
BianLzhaoMin 99627bab6f 标段工程新增时优化 2024-08-27 09:35:54 +08:00
BianLzhaoMin 9797d3d1ba 代码优化 2024-08-27 09:24:59 +08:00
BianLzhaoMin 67eb5113e6 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-08-26 21:27:48 +08:00
BianLzhaoMin 893706ad26 代码优化 2024-08-26 21:27:42 +08:00
liang.chao 2e00a1ffaa Merge remote-tracking branch 'origin/dev-nx' into dev-nx 2024-08-26 21:19:41 +08:00
liang.chao 406f402c9c 无用字段删除 2024-08-26 21:19:31 +08:00
BianLzhaoMin 64c9f2cad6 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-08-26 20:53:39 +08:00
BianLzhaoMin 917829ce1b 大屏功能完善 2024-08-26 20:53:34 +08:00