2502 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
liyongde	74decb66f7	fix: pc可修改分切计划信息-前端	2024-07-02 22:44:13 +08:00
liyongde	f606c6a16a	fix: pc可修改分切计划信息	2024-07-02 22:43:33 +08:00
tuqiang	2bf7146c87	rev:优化agv下发方法	2024-07-02 20:38:23 +08:00
lishuai	4fb3552444	Merge remote-tracking branch 'origin/master'	2024-07-02 19:38:30 +08:00
lishuai	72b6c48a55	fix: 行架action变成5修改，扫码位终点为货位修改	2024-07-02 19:38:09 +08:00
yanps	f9fc6e8a50	opt: 仙工驱动监控页面实现国际化,NDC反馈行架还原	2024-07-02 17:24:26 +08:00
gongbaoxiong	c3a8cd70bd	add:增加子卷规格校验	2024-07-02 17:13:27 +08:00
gongbaoxiong	3faf1b65c1	add:增加装箱区库存页面	2024-07-02 16:30:19 +08:00
zhouz	8add85dd71	Merge branch 'refs/heads/b_lms' into master_merge	2024-07-02 16:27:15 +08:00
zhouz	7824298f1a	fix:MES相关接口优化	2024-07-02 16:26:30 +08:00
liyongde	6a2a26e3c4	Merge remote-tracking branch 'origin/b_lms' into b_lms	2024-07-02 15:48:09 +08:00
liyongde	03a94a7179	fix: 呼叫气胀轴查询acs，气胀轴库没货则生成任务	2024-07-02 15:37:10 +08:00
liuxy	2de875acd0	rev：增加捆扎相关校验	2024-07-02 14:03:20 +08:00
liuxy	c8c1335329	Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms	2024-07-02 14:02:32 +08:00
liuxy	90572dc622	rev：增加捆扎相关校验	2024-07-02 14:02:15 +08:00
gongbaoxiong	f10d468c21	opt:优化子卷按子卷规格排序	2024-07-02 14:00:34 +08:00
liuxy	2f6cbfd9c1	rev： 立库堆垛机相关任务下发时 给托盘号	2024-07-02 13:29:00 +08:00
gongbaoxiong	5826a97da2	Merge remote-tracking branch 'origin/b_lms' into b_lms	2024-07-02 13:12:51 +08:00
gongbaoxiong	1a72a6cb78	opt:优化一楼装箱区任务类相关校验	2024-07-02 13:12:34 +08:00
yanps	d795315fe1	opt: 仙工机器人信息设备监控显示优化	2024-07-02 11:21:13 +08:00
tuqiang	216cd5540f	rev:优化自动门写方法	2024-07-02 09:59:19 +08:00
lishuai	818b88f70b	fix: 日志修改	2024-07-02 09:34:44 +08:00
liyongde	a84a6544f9	fix: 手持菜单区分与清除暂存修改	2024-07-02 09:27:01 +08:00
liyongde	1cf2e6305d	fix: 删除子卷包装关系，异常包裹	2024-07-01 22:00:58 +08:00
liyongde	58f243053a	Merge remote-tracking branch 'origin/b_lms' into master_merge	2024-07-01 17:35:47 +08:00
liyongde	5871c91af5	fix: 套轴过滤一期分切计划	2024-07-01 17:34:31 +08:00
liyongde	04ecf56d51	Merge remote-tracking branch 'origin/b_lms' into master_merge	2024-07-01 16:48:17 +08:00
zhouz	b3227f1a8d	Merge remote-tracking branch 'origin/master_merge' into master_merge	2024-07-01 16:45:18 +08:00
liyongde	8ef3d51a8b	feat: 分切拼接、区域注释	2024-07-01 16:42:18 +08:00
zhouz	efafb265eb	fix:MES相关接口优化	2024-07-01 16:42:00 +08:00
liuxy	7f201dba96	rev：代码合并	2024-07-01 15:13:51 +08:00
liuxy	69b58c9d06	Merge branch 'master' into master_merge	2024-07-01 15:13:07 +08:00
liuxy	e9f415d8cf	rev：改切入库回传	2024-07-01 15:10:58 +08:00
liyongde	a546856fda	fix: 气胀轴代数校验位置改为分切计划表2	2024-07-01 14:04:17 +08:00
liyongde	b00a5a23ef	fix: 气胀轴代数校验位置改为分切计划表	2024-07-01 14:04:15 +08:00
liuxy	4c07bdbfca	Merge branch 'master_merge' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_merge ... # Conflicts: # lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/BstIvtBoxinfo.java	2024-07-01 13:58:54 +08:00
liuxy	ea5bfbf40e	rev：捆扎相关修改	2024-07-01 13:53:48 +08:00
yanps	3290cc8ff9	opt: 烘箱区域反馈行架调整,还原agv偏移功能	2024-07-01 09:51:23 +08:00
liyongde	a6536eb7ad	fix: 气胀轴代数校验位置改为分切计划表2	2024-07-01 09:38:40 +08:00
liyongde	c0d837711e	fix: 气胀轴代数校验位置改为分切计划表	2024-07-01 09:28:02 +08:00
zhouz	729afce407	fix:WQL数据新增，入烘箱优化	2024-06-30 18:54:13 +08:00
gongbaoxiong	9ecc870369	opt:优化子卷装箱校验逻辑	2024-06-30 18:10:59 +08:00
liyongde	1206370204	fix: 字符拼接	2024-06-30 17:56:23 +08:00
liyongde	7caf3d0f97	Merge remote-tracking branch 'origin/b_lms' into master_merge	2024-06-30 16:05:34 +08:00
tuqiang	1f9ee5dfe7	rev:删除agv进出自动门对烘箱逻辑判断	2024-06-30 15:34:24 +08:00
zhouz	1b3075007d	Merge branch 'master_merge' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_merge	2024-06-30 15:19:00 +08:00
zhouz	35ccff0564	fix:重量校验	2024-06-30 15:18:44 +08:00
liyongde	17032c858a	opt: 备货区与气胀轴库优化-前端	2024-06-30 14:24:14 +08:00
liyongde	eb95498a07	opt: 备货区与气胀轴库优化	2024-06-30 14:22:54 +08:00
liyongde	8c8c08b8f3	Merge remote-tracking branch 'origin/b_lms' into master_merge	2024-06-30 10:43:33 +08:00