Commit Graph

2033 Commits

Author SHA1 Message Date
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
liang.chao 1ee2760a7c 配置文件修改 2024-08-26 20:27:17 +08:00
liang.chao eb09e27ab5 Merge remote-tracking branch 'origin/dev-nx' into dev-nx 2024-08-26 20:25:45 +08:00
liang.chao 6de2c8b5c3 大屏二级页面接口增加 2024-08-26 20:25:38 +08:00
BianLzhaoMin baef8909bf Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-08-23 08:54:58 +08:00
BianLzhaoMin b62d692d3e 代码优化 2024-08-23 08:54:51 +08:00
liang.chao 0bfae9191a iot设备code字符问题修改 2024-08-22 11:04:07 +08:00
liang.chao 4f2454d7dd iot设备code字符问题修改 2024-08-22 11:01:08 +08:00
liang.chao 52f40b3acd 角色表查询sql修改 2024-08-21 16:46:40 +08:00
liang.chao 82cd7e1cca 本地配置文件修改 2024-08-21 14:34:05 +08:00
liang.chao 4d3673b337 Merge remote-tracking branch 'origin/dev-nx' into dev-nx 2024-08-21 14:14:25 +08:00
liang.chao 5311cb0c5c Merge branch 'macode20240820' into dev-nx 2024-08-21 14:13:58 +08:00
sxu 5aa904aa95 remark 2 scripts 2024-08-21 14:11:30 +08:00
sxu f9488d54fd 合并profile改动 2024-08-21 14:01:52 +08:00
liang.chao 0a01e46d18 machine库存查询修改 2024-08-21 11:20:27 +08:00
sxu 25b4cad47e 合并重复提交改动 2024-08-21 11:09:06 +08:00
liang.chao 2edf5af00b machine库存查询修改 2024-08-20 14:09:48 +08:00
sxu a0affba5ae 防重复提交 2024-08-19 18:55:50 +08:00
liang.chao 8638358fa1 大屏定位信息代码提交 2024-08-19 17:59:40 +08:00
liang.chao 90210e0ac4 大屏定位信息代码提交 2024-08-19 17:49:56 +08:00
BianLzhaoMin d6434ff805 代码优化 2024-08-16 13:37:50 +08:00
BianLzhaoMin f3312f4970 结算金额处略微调整 2024-08-15 09:34:06 +08:00
BianLzhaoMin 2ed34bec99 费用结算页面优化 2024-08-14 17:07:38 +08:00
BianLzhaoMin 6d7a3e9f10 结算页面费用调整 2024-08-14 15:10:35 +08:00
BianLzhaoMin 13ca08d4a3 结算费用模块调整 2024-08-14 14:52:39 +08:00