Merge remote-tracking branch 'zzb/master'
调整冲突错误
菜单调整。
补货数据结构整理 1.
补货数据结构整理 ，及相关菜单配置.
补货数据结构整理 .
test临时更改
Signed-off-by: Endis <zhengzhibin@skyseaok.com>
Merge branch 'yzyc' of https://github.com/THOK-SW/wms_rfid_mdj.git
Merge branch 'master' of https://github.com/2Tiramisu/wms_rfid_mdj.git
PositionCapacity列增加
Signed-off-by: Endis <zhengzhibin@skyseaok.com>
Merge branch 'master' of https://github.com/Endis/wms_rfid_mdj.git into yz
Merge branch 'yz' of https://github.com/zqloon/wms_rfid_mdj.git
修正优化BUG
Signed-off-by: Endis <zhengzhibin@skyseaok.com>
Merge branch 'master' of https://github.com/Endis/wms_rfid_mdj.git into yz
增加三张补货计划表
Signed-off-by: zqloon <zqloon@gmail.com>
增加异型分拣线和整件分拣线作业调度
Signed-off-by: zqloon <zqloon@gmail.com>