Commit Graph

1405 Commits

Author SHA1 Message Date
qianhao.xu
fca042d60c wm:修改出库单 2024-04-08 11:01:42 +08:00
qianhao.xu
be046ed354 wms:移动端:批量查看 2024-04-07 19:03:58 +08:00
qianhao.xu
657d2e17de wms:批量货物查看 2024-04-02 17:11:30 +08:00
qianhao.xu
5ab034b4a1 1231234 2024-04-01 17:20:23 +08:00
赵正易
eba40db228 AGV小车功能 2024-03-29 17:32:06 +08:00
赵正易
51305bc7ab 获取agv 起点和终点,入参修改 2024-03-29 15:31:08 +08:00
赵正易
04f5aee6a0 Merge branch 'main' of https://gitee.com/doan-tech/shanghaigangxiangtuzhuangMES 2024-03-29 15:20:12 +08:00
qianhao.xu
ca763ec392 wms:agv: agv点位信息修改 2024-03-29 15:19:53 +08:00
qianhao.xu
c4394798d7 wms:agv: agv点位信息修改 2024-03-29 14:43:15 +08:00
赵正易
a9d3ce16e6 Merge branch 'main' of https://gitee.com/doan-tech/shanghaigangxiangtuzhuangMES
# Conflicts:
#	ZR.Admin.WebApi/Controllers/mes/wms/WmAGVController.cs
2024-03-29 14:04:16 +08:00
赵正易
90af133f7e 1 2024-03-29 14:03:41 +08:00
qianhao.xu
5bbc99cb74 Merge branch 'production' 2024-03-29 10:38:03 +08:00
qianhao.xu
a94914190a 134 2024-03-29 10:32:02 +08:00
qianhao.xu
bb5a39fb0a wms:agv:init 2024-03-29 10:27:21 +08:00
qianhao.xu
591c902b32 wms:agv:init 2024-03-29 10:24:20 +08:00
qianhao.xu
26e32f18fa WMS:AGV:init 2024-03-29 10:07:16 +08:00
qianhao.xu
121c888a6b WMS:AGV:init 2024-03-29 09:13:26 +08:00
赵正易
de15bc289a 出库单计划:发运清单
物料清单:发运单
数据对应完成,交由客户测试
2024-03-28 15:37:33 +08:00
赵正易
d78f810f42 仓库-优化入库出库接口,添加trycatch判断 2024-03-28 12:30:07 +08:00
赵正易
8e279bdd8a WMS仓库-解析箱标签功能提取到MaterialUtils内,入库,出库判断接口优化,入库添加新标签编码解析 2024-03-28 11:18:51 +08:00
赵正易
8bb784a3e5 Merge branch 'production' of https://gitee.com/doan-tech/shanghaigangxiangtuzhuangMES 2024-03-28 09:18:26 +08:00
qianhao.xu
82b945658f 111 2024-03-28 09:12:17 +08:00
赵正易
cf2d240216 Merge branch 'production' of https://gitee.com/doan-tech/shanghaigangxiangtuzhuangMES
# Conflicts:
#	ZR.Admin.WebApi/Controllers/mes/wms/WmOutOrderController.cs
2024-03-28 08:53:41 +08:00
qianhao.xu
9e6577f17e 111 2024-03-28 08:52:44 +08:00
赵正易
a5196f42e4 出库接口添加 2024-03-27 18:10:53 +08:00
赵正易
dc175ab22f Merge branch 'production' of https://gitee.com/doan-tech/shanghaigangxiangtuzhuangMES 2024-03-27 17:23:15 +08:00
赵正易
c756597610 出库接口添加 2024-03-27 17:19:36 +08:00
qianhao.xu
604dffaca7 修改 2024-03-27 14:37:52 +08:00
qianhao.xu
1c03b83b13 合并仓库管理:checklog 2024-03-27 14:37:52 +08:00
赵正易
a980a980a0 仓库-入库解析标签功能添加,添加一个综合判断是否能入库的接口 2024-03-27 14:33:53 +08:00
赵正易
1da4023e71 Merge branch 'production' of https://gitee.com/doan-tech/shanghaigangxiangtuzhuangMES 2024-03-27 13:15:59 +08:00
qianhao.xu
3ae7bd01cc 仓库管理:checklog 2024-03-26 16:05:11 +08:00
赵正易
01803c1f09 Merge branch 'production' of https://gitee.com/doan-tech/shanghaigangxiangtuzhuangMES
# Conflicts:
#	ZR.Admin.WebApi/appsettings.development.json
2024-03-26 15:31:49 +08:00
qianhao.xu
e620e3d8b9 仓库管理:checklog 2024-03-26 15:21:21 +08:00
qianhao.xu
6386aef7cf 仓库管理:出货计划:新增修改 2024-03-26 15:03:49 +08:00
qianhao.xu
4bf469a5c4 仓库管理:出货计划:update 2024-03-26 14:19:01 +08:00
qianhao.xu
bc500a125a 仓库管理_出库单:出库计划 2024-03-23 15:19:58 +08:00
qianhao.xu
1272af5989 仓库管理:库位:update 2024-03-23 14:31:59 +08:00
qianhao.xu
f7eb497570 仓库管理_入库模块:修正 2024-03-23 14:31:58 +08:00
qianhao.xu
5a51afb8a8 仓库管理_入库模块:修正 2024-03-22 09:53:34 +08:00
qianhao.xu
6e27c0eb94 仓库模块_当前货物表:init 2024-03-22 09:31:04 +08:00
qianhao.xu
3e7cd97255 仓库模块_出库货物记录:init 2024-03-22 09:31:04 +08:00
赵正易
f26209ba45 Merge branch 'production' of https://gitee.com/doan-tech/shanghaigangxiangtuzhuangMES
# Conflicts:
#	ZR.Admin.WebApi/appsettings.development.json
2024-03-22 09:11:07 +08:00
qianhao.xu
dac58ddb77 仓库模块_出库货物记录:init 2024-03-22 08:54:11 +08:00
qianhao.xu
2074ea2e84 质量模块_质量统计: 添加颜色 2024-03-20 14:16:24 +08:00
赵正易
be26bfedce Merge branch 'production' of https://gitee.com/doan-tech/shanghaigangxiangtuzhuangMES
# Conflicts:
#	ZR.Admin.WebApi/appsettings.development.json
2024-03-19 20:49:10 +08:00
qianhao.xu
a3d7b47a88 本地时间修正 2024-03-19 20:42:02 +08:00
qianhao.xu
beb48faf65 Revert "质量报表日期查询方式修改"
This reverts commit ca026042f7ae0d2702403a3bdc1b7d6e3757b070.
2024-03-19 20:42:02 +08:00
赵正易
28d83b147e 质量报表日期查询方式修改 2024-03-19 20:42:02 +08:00
qianhao.xu
bf4e606977 仓库模块_出库:修正 2024-03-19 11:08:28 +08:00