Commit Graph

1381 Commits

Author SHA1 Message Date
737dbd336e add:对烘箱对接位添加允许强制进入功能 2023-10-26 18:31:01 +08:00
USER-20220102CG\noblelift
75cea7fe40 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-10-26 17:17:35 +08:00
USER-20220102CG\noblelift
7740a8bbad rev 行架任务校验 2023-10-26 17:17:13 +08:00
3e75d99207 rev:合并 2023-10-26 17:07:30 +08:00
f88200f2bd Merge branch 'master_reform' 2023-10-26 17:06:08 +08:00
0c466793ba rev: 限制木箱高度 2023-10-26 17:00:54 +08:00
384872d687 rev:立库改造、入库分配逻辑修改、移库逻辑修改 2023-10-25 08:58:23 +08:00
USER-20220102CG\noblelift
98c7717fcc Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-10-24 10:11:35 +08:00
USER-20220102CG\noblelift
c7fd9d892d rev ndc链接 2023-10-24 10:10:57 +08:00
7caf22fff3 Merge branch 'package-dev' 2023-10-23 18:04:53 +08:00
c9f85aa08b dev:报表优化、入库加并发锁 2023-10-23 17:50:13 +08:00
USER-20220102CG\noblelift
9224b0d07c rev 修复任务指令内存问题 2023-10-19 11:28:09 +08:00
b8c9688018 dev:分支推送 2023-10-19 09:46:00 +08:00
4018922b9b rev:测试 2023-10-19 09:28:32 +08:00
e650ea273a rev:新增二期区域、查询优化 2023-10-18 14:32:29 +08:00
1d9f35dded rev:是、出入库导出修改 2023-10-17 08:57:49 +08:00
f9c6c5e35e rev:导出维护字段销售订单、行号 2023-10-16 17:35:12 +08:00
ee17bd9b32 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-10-16 17:29:43 +08:00
c9447c29a7 dev:修改明细查询BUG 2023-10-16 17:29:34 +08:00
98e39369f4 add:新增海亮二期仓库入库 2023-10-13 16:18:05 +08:00
f37290339c Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-10-13 16:14:44 +08:00
e1aa85bcb6 rev:报表优化 2023-10-13 16:14:36 +08:00
张江玮
740d859f34 add 桁架 x y 轴信号 2023-10-09 18:13:09 +08:00
张江玮
c5a061454f add 烘箱桁架 分切桁架 行走行信号 2023-10-09 10:40:16 +08:00
1dd02f0195 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-10-08 17:46:27 +08:00
b3f59428ee dev:改切出库支持多条明细推送,幅宽精度显示优化 2023-10-08 17:46:14 +08:00
USER-20220102CG\noblelift
914c20932e Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-10-07 08:46:10 +08:00
USER-20220102CG\noblelift
130928b672 rev 直管库 2023-10-07 08:45:31 +08:00
29a4c41723 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-09-28 22:14:49 +08:00
e26c48f355 rev:大屏修改 2023-09-28 22:14:41 +08:00
52a2a04427 rev:报表优化 2023-09-28 22:14:16 +08:00
ac30120460 rev:1.立库监控新增空托盘监控 2.调拨同步接口支持多条明细 2023-09-27 15:59:50 +08:00
张江玮
d8769461a7 fix queryDevice 2023-09-27 14:16:07 +08:00
USER-20220102CG\noblelift
e741a8c9ea rev 读取线程 2023-09-26 13:22:02 +08:00
94f3c692e5 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-09-26 11:02:09 +08:00
25b0c1d7a7 rev:幅宽精度问题 2023-09-26 11:02:01 +08:00
84727df37e rev:手持报废入库支持多种报废类型 2023-09-25 14:45:51 +08:00
8a21fdb289 rev:修改:1、库存查询报表新增库存类型可多选;2、发货信息送货单位改为下拉框,车型改为下拉框且支持自定义输入;3、对报表的幅宽进行保留小数限制;4、入库管理新增销售订单及行号查询条件 2023-09-22 08:54:38 +08:00
ec5a330508 rev:发货出库发货信息修改 2023-09-21 16:58:12 +08:00
aa4646a832 rev:开关按钮颜色更改 2023-09-21 16:30:15 +08:00
USER-20220102CG\noblelift
aad04350d4 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-09-21 14:54:10 +08:00
USER-20220102CG\noblelift
ff00076083 rev 报警信息 2023-09-21 14:53:55 +08:00
a0c4c73949 rev:库存报表增加子卷数 2023-09-21 14:19:50 +08:00
429909de3b rev:临期库存 2023-09-21 14:05:30 +08:00
b3b34ccd44 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-09-20 15:31:54 +08:00
49c1b5f942 rev:修改:1、新增退货库区;2、根据当前报表需求新增两个出入库报表页面;3、出库分配页面已经下发的任务无法取消;4、出入库报表、转单页面新增子卷号查询字段;5、冷却区页面新增回传MES入冷却按钮;6、手持其他入库也增加库区选择;7、新增改切入库类型,按照MES传的包装关系生成改切入库单;8、临期库区页面修改; 2023-09-20 15:31:46 +08:00
1a89f5d1be rev:临期库存报表 2023-09-20 15:02:39 +08:00
8f5511c2d6 rev:excel解密 2023-09-19 09:01:56 +08:00
40f7c722de rev:出入库报表相关修改 2023-09-19 08:43:19 +08:00
4394288ff5 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-09-12 17:57:19 +08:00