Commit Graph

1110 Commits (ad2a7f8722337db227025f1b771ca63ca6500062)
 

Author SHA1 Message Date
王杰 ba80057ac8 读设备数据 写日志 增加 10 months ago
jun 05ccf6501f Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun b731d10d44 电子化检验拆解功能开发 10 months ago
yxw d818cb08d7 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw bcf15b1eaa 修改原材料修改记录表 10 months ago
yxw d5d51e0585 Merge remote-tracking branch 'origin/dev' into dev-wuhan 10 months ago
王杰 fae918112f Merge branch 'dev' into dev-wuhan 10 months ago
王杰 f06716eec8 生产零件号 可复用 报错 问题修复 10 months ago
王杰 a2c80f138d 代码写错 10 months ago
王杰 f9a1e5322e Merge branch 'dev' into dev-wuhan 10 months ago
王杰 27b40d6709 设备查询点位数据去除事务 10 months ago
jun bc60e1a2c1 电子化检验拆解功能开发 10 months ago
yxw 9f6afe14fd 解决代码冲突 10 months ago
yxw 92f9a79e97 PCN长度修改类型获取接口 10 months ago
yxw abc8599d73 Merge remote-tracking branch 'origin/dev' into dev-wuhan
# Conflicts:
#	modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java
10 months ago
yxw 9841ac7cde Merge remote-tracking branch 'origin/dev' into dev-wuhan
# Conflicts:
#	modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesEquipVariableCollectContext.java
10 months ago
jun 5a6b1f1d2a Merge remote-tracking branch 'origin/dev' into dev 10 months ago
yxw 9b018ceb28 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw a8db4e761c 裁片原材料防错 10 months ago
yxw 6537f792ef 裁片原材料防错 10 months ago
jun 43ba2569c1 非排序拆解功能 10 months ago
王杰 a5dd6cf0f3 常量 睡眠2s改500ms 10 months ago
王杰 8e321c50ff wuhan 工单 工步 10 months ago
xiangwei.zhang 25b01eb43c 判断可疑 10 months ago
xiangwei.zhang 17cc0df013 判断可疑 10 months ago
gsz 1ae2f9a3f2 42925 原材料防错优化 10 months ago
yxw 38c4fa0907 裁片功能主数据表 10 months ago
gsz 7fd1e0aa7a Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 10 months ago
gsz 6179c4b4b1 电子化检验 质量状态发生变化后,同步标识改为未同步 10 months ago
jun 2d7e14e916 原材料防错,提交逻辑优化(代码回退) 10 months ago
jun 463a365660 非排序 返工拆解流程开发 10 months ago
jun e8395e2062 非排序 返工拆解流程开发 10 months ago
jun 8dc523d83d PCN和网页端的工单页面做批量报工,生成的条码规则不需要取物料扩展属性的条码规则,取一个固定的规则即可(8位年月日+4位流水号) 10 months ago
jun 9b7c9e4bb2 原材料防错,提交逻辑优化 10 months ago
jun c927a4f9e0 发运单中装车单字段赋值 10 months ago
jun 3d7358c134 设备点检,点检类型:设备点检、工艺参数点检,点击开始点检后,需要强制扫描/输入设备ID 10 months ago
jun 045414d98d 点检功能,工艺参数点检,目前无法完整使用该功能。 10 months ago
王杰 c71f0e983a 工序用量, 不显示且不扫描, 规则且唯一单独表记录 10 months ago
jun 4e61e55de5 汇总工单发送SAP逻辑调整 10 months ago
王杰 48d268e2e1 发送设备加工参数, 物料取值变更 10 months ago
王杰 cb2f68baf8 扫描装配件工步 魔鬼数字 改枚举 10 months ago
gsz 5245e00ca9 工位参数按钮事件接口实现【设备停机】FUNCTION_EQU_DOWNTIME 10 months ago
王杰 5f6a79b122 71 239 配置文件 10 months ago
王杰 9d91db16b3 工步操作redis 方法去动词; 读加工结果 增加shot 10 months ago
jun 96924514fb 装配件替换,提示信息优化 10 months ago
jun 603123568f 返工,装配件替换问题修复 10 months ago
gsz 53b5928add 报工job修改 10 months ago
jun 59f9023c23 Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun 8361a745e6 42786 电子化检验质检完成后,进入NC判定后未记录判定操作人
42782 装配件替换,目前是选择复选框后,需要按照顺序进行扫描
10 months ago
gsz d2ef4c8a4a newMesProductOffLine赋值修改SapWorkCenter--祥卫 10 months ago