Commit Graph

2288 Commits

Author SHA1 Message Date
zhouz
8664d7943f fix:异常任务相关处理 2024-05-21 14:53:49 +08:00
a57a696a9b Merge remote-tracking branch 'origin/master' 2024-05-21 13:42:35 +08:00
78242a58e0 fix: 堆垛机联调修改 2024-05-21 13:41:10 +08:00
9d6fb3c4fa Merge remote-tracking branch 'origin/b_lms' into b_lms 2024-05-20 17:30:17 +08:00
ca892b7644 opt:修改输送线到满轴位四个点任务逻辑; 2024-05-20 17:30:01 +08:00
b9854b2c66 add:新增生成excel任务调度 2024-05-20 16:34:10 +08:00
8217df4480 Merge remote-tracking branch 'origin/b_lms' into b_lms 2024-05-20 10:43:56 +08:00
9f73e74445 fix: 内包间任务完成点位数据赋值不对 2024-05-20 10:43:18 +08:00
098330e94f rev:代码合并 2024-05-20 09:24:03 +08:00
8122f60be9 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-05-20 09:23:35 +08:00
c5fdf97b98 rav:任务完成时释放货位以及库存 2024-05-20 09:23:24 +08:00
f22475a6ef opt:优化空木箱出库,装箱区,子卷木箱分配相关逻辑。 2024-05-19 23:06:36 +08:00
e1de520be0 fix: 联调 2024-05-19 20:19:22 +08:00
yanps
2a4671d6c5 opt: 气胀轴缓存架优化 2024-05-19 16:32:40 +08:00
c07a23e1e1 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2024-05-19 14:34:38 +08:00
ed68b654d8 fix:密码修改 2024-05-19 14:34:27 +08:00
zhouz
7b868f213c fix:新增退货入库业务 2024-05-18 11:33:10 +08:00
yanps
50e964fe8f opt: 贴标捆扎位优化 2024-05-18 09:05:55 +08:00
zhouz
20904af6d5 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-05-17 17:02:49 +08:00
zhouz
6746f0a088 fix:入库修改 2024-05-17 17:02:43 +08:00
6ad2cc8493 Merge remote-tracking branch 'origin/master' 2024-05-17 11:04:13 +08:00
58d0dfa279 opt:优化子卷包装界面样式 2024-05-17 10:28:18 +08:00
511ad95ddd fix: 退货入库流程添加 2024-05-17 09:52:04 +08:00
yanps
db0071fb70 opt: 优化堆垛机,贴标位驱动 2024-05-17 09:47:10 +08:00
6d780d134a rev:更新捆扎贴标位下发信号 2024-05-16 20:34:21 +08:00
fc94a4799c fix: 联调修改 2024-05-16 19:12:03 +08:00
0880386c3d rev: 代码合并 2024-05-16 18:58:22 +08:00
738f5d7e28 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-05-16 18:57:46 +08:00
624e3ac2c9 rev: 仓位不区分库区 2024-05-16 18:57:33 +08:00
96515306bd opt:修改入库木箱获取方式 2024-05-16 17:09:19 +08:00
a615fa19ce Merge remote-tracking branch 'origin/b_lms' into b_lms 2024-05-16 17:08:48 +08:00
5fbe891da9 opt:修改入库木箱获取方式 2024-05-16 17:08:33 +08:00
f96ad6d54a Merge remote-tracking branch 'origin/b_lms' into b_lms 2024-05-16 16:12:13 +08:00
d6fc326bcd fix: 内包间任务下发参数字段名错误 2024-05-16 16:11:42 +08:00
zhouz
1971e6ced2 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-05-16 09:37:59 +08:00
zhouz
68f1aef4b0 fix:空木箱入库增加高度限制 2024-05-16 09:37:54 +08:00
2873820eb0 opt:获取纸管长度 2024-05-15 21:20:40 +08:00
zhouz
10f431ca71 fix:入库新增高度要求 2024-05-15 20:26:02 +08:00
8eb06a6dcc opt:获取纸管长度 2024-05-15 19:50:31 +08:00
070946f905 opt:获取纸管长度 2024-05-15 19:49:41 +08:00
e6b3461cd9 opt:子卷装箱测试 2024-05-15 19:19:58 +08:00
32549c4b06 fix: 推送名称修改测试 2024-05-15 18:51:55 +08:00
5bfc0ab874 Merge remote-tracking branch 'origin/master' 2024-05-15 16:17:14 +08:00
7a761e6577 fix: 联调木箱入库 2024-05-15 15:36:15 +08:00
92105c1cb3 rev:1.出库任务优化:任务完成后更新仓位、库存等信息,单据完成后则根据情况更新库存,情况1:虚拟库,完成单据更新虚拟区仓位、库存,情况2:超期发货:如果子卷超期且是超期发货则更新库存、仓位信息。2.移库任务下发优化:判断是从左边开始移库还是右边开始移库修改 2024-05-15 14:01:47 +08:00
yanps
34a84e5bb6 opt: 监控页面设备信息显示优化 2024-05-15 11:21:23 +08:00
cf60ace60f fix: 角色权限分配不显示 2024-05-15 09:37:11 +08:00
zhouz
f4e308a50f Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-05-15 09:08:04 +08:00
zhouz
8ee4fb2f2d fix:空托盘入库修改 2024-05-15 09:07:59 +08:00
68b6ddb793 opt:子卷装箱测试 2024-05-14 22:49:10 +08:00