Commit Graph

896 Commits

Author SHA1 Message Date
zhangzhiqiang
eeb28c7361 Merge remote-tracking branch 'origin/master' 2023-08-25 15:43:35 +08:00
zhangzhiqiang
7b215e061f add:设备运行记录 2023-08-25 15:43:30 +08:00
wangs
fe98a98ae0 rev opc读写共用一个server 2023-08-25 13:47:41 +08:00
909766d20e add:半成品出入库导出功能 2023-08-24 17:09:51 +08:00
zhangzhiqiang
25c51f7c6c add:半成品库添加入库类型 2023-08-24 14:45:15 +08:00
zhangzhiqiang
8da0e84f00 rev:刻字上料方案修改 2023-08-23 21:56:16 +08:00
zhangzhiqiang
ed6d5a535d Merge remote-tracking branch 'origin/master' 2023-08-23 18:43:22 +08:00
zhangzhiqiang
64dcbe1e79 add:添加空框送回按钮 2023-08-23 18:42:25 +08:00
68d7cca968 rev:大屏改造成mybatis以及代码优化 2023-08-23 17:28:02 +08:00
zhangzhiqiang
b18448e695 add:添加空框送回按钮 2023-08-23 16:58:13 +08:00
zhangzhiqiang
01d96359a6 rev:半成品库存导出修改 2023-08-23 16:24:18 +08:00
zhangzhiqiang
08cc55eb5d Merge branch 'master' into feature/三线需求_818 2023-08-23 14:18:52 +08:00
zhangzhiqiang
f5ae3ef903 rev:清洗相关功能优化 2023-08-23 11:01:29 +08:00
zhangzhiqiang
cc96dd2031 rev:清洗上料相关修改 2023-08-22 21:38:24 +08:00
zhangzhiqiang
53f318fa8e rev:清洗上料相关修改 2023-08-22 21:33:19 +08:00
zhangzhiqiang
4c6484bc2b Merge remote-tracking branch 'origin/master' 2023-08-22 15:05:58 +08:00
zhangzhiqiang
60a2138e97 rev:清洗机上料 2023-08-22 15:05:53 +08:00
87e67df718 rev:海柔半成品下发任务类型 2023-08-22 13:38:10 +08:00
zhangzhiqiang
c71642a66b Merge remote-tracking branch 'origin/master' 2023-08-22 13:36:12 +08:00
zhangzhiqiang
89fb5d375b opt:修改成品出库优先级 2023-08-22 13:35:11 +08:00
wangs
b4d06c541c rev opc读取时不建立新连接 2023-08-21 18:36:20 +08:00
zhangzhiqiang
4ce0359d16 rev:成品出库取消分配校验 2023-08-21 18:06:00 +08:00
zhangzhiqiang
626f7b7aad rev:修改mes 2023-08-20 17:56:56 +08:00
zhangzhiqiang
3aaa8b4944 add:数据库 2023-08-20 17:38:41 +08:00
zhangzhiqiang
899431897e add:添加定时任务关闭方法 2023-08-18 20:08:16 +08:00
zhangzhiqiang
c05dda3bf4 Merge remote-tracking branch 'origin/master' 2023-08-18 16:06:53 +08:00
zhangzhiqiang
54b6cccf67 apt:输送线任务改成异步调用/刻字空框送回不做点位校验; 2023-08-18 16:06:45 +08:00
wangs
908c8ed7c8 rev 更新单工ndc连接 2023-08-18 16:03:45 +08:00
9f7789abc9 rev: 限制拼盘重量不能大于150kg 2023-08-18 14:55:50 +08:00
8da0178d04 rev:1.成品出库分配站点设置明细显示 2.成品出库分配查询站点下拉框未锁定的 3.配粉发货区锁定4.新增页面:成品发货区 2023-08-18 09:42:00 +08:00
zhangzhiqiang
2300b7db66 opt:任务优先级 2023-08-16 14:25:07 +08:00
zhangzhiqiang
f23bb88d63 opt:任务优先级 2023-08-16 11:51:08 +08:00
USER-20220102CG\noblelift
17fe0e6447 rev 更新测试读、写未关闭链接 2023-08-16 10:55:06 +08:00
6a8a9c6e40 rev:个人信息修改 2023-08-15 21:07:21 +08:00
zhangzhiqiang
02d39afbd5 add:新增包装标签打印 2023-08-15 20:03:57 +08:00
zhangzhiqiang
aa54150593 add:三线包装工单 2023-08-15 19:12:40 +08:00
4bbaa58d36 rev:更新箱记录表 2023-08-15 14:23:30 +08:00
60058e963f rev:1.海柔半成品acs与mes接口 2.半成品、成品库存增加单据类型字段 2023-08-11 18:56:01 +08:00
zhangzhiqiang
ac23052354 Merge remote-tracking branch 'origin/master' 2023-08-11 17:14:54 +08:00
zhangzhiqiang
7824c459be rev:刻字上料半成品库存过滤 2023-08-11 17:14:47 +08:00
USER-20220102CG\noblelift
29f251f7d9 rev 更新底层写入信号逻辑 2023-08-11 16:49:55 +08:00
zhangzhiqiang
b345ea5757 rev:刻字上料输送线任务顺序 2023-08-11 16:36:16 +08:00
77795095ba add:成品出库分配页面新增一键设置功能 2023-08-10 19:13:06 +08:00
ef78cef7d8 rev:导入销售单生成id 2023-08-10 16:36:14 +08:00
379cfc7179 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2023-08-10 16:35:30 +08:00
c433ccde33 rev:导入销售单生成id 2023-08-10 16:35:12 +08:00
zhangzhiqiang
dc5031c9fa Merge remote-tracking branch 'origin/master' 2023-08-10 16:35:07 +08:00
zhangzhiqiang
57e6bebda1 add:添加刻字回流 2023-08-10 16:35:02 +08:00
81606c082c rev:仓位模糊查询修改、组盘记录:过滤掉相同订单、托盘的组盘记录 2023-08-10 15:04:59 +08:00
zhangzhiqiang
bcbe605342 修改:临时包装区上料 2023-08-10 14:45:45 +08:00