Signed-off-by: zqloon <zqloon@gmail.com>
Merge branch 'mdj' of https://github.com/zqloon/wms_rfid_mdj.git
Merge branch 'mdj' of https://github.com/THOK-SW/wms_rfid_mdj.git
1.将叠空托盘的设定值放入系统参数中设置；2.叠放空托盘优先级第二层货架
1.将叠空托盘的设定值放入系统参数中设置；2.叠放空托盘优先级第二层货架 （补充）
1.将叠空托盘的设定值放入系统参数中设置；2.叠放空托盘优先级第二层货架(BUG修复，LINQ实体中不能使用强转)
完善打印功能
出库操作在库存和冻结量都是0的情况下再将该货位卷烟品牌设为null
Merge remote-tracking branch 'wms_rfid_mdj_zwh/master' into yzyc
Merge remote-tracking branch 'wms_rfid_mdj_zys/mdjyc' into yzyc
修改合并后的命名错误，编译通不过。
增加手工补货优化
Signed-off-by: Endis <zhengzhibin@skyseaok.com>
修正手工补货优化Bug
Signed-off-by: Endis <zhengzhibin@skyseaok.com>
Merge remote-tracking branch 'zzb/master'
调整冲突错误
Merge remote-tracking branch 'wms_rfid_mdj_zzb/master' into yzyc
菜单调整。
补货数据结构整理 1.
补货数据结构整理 ，及相关菜单配置.
Merge branch 'yzyc' of https://github.com/THOK-SW/wms_rfid_mdj.git into yz