Commit Graph

318 Commits (6e90772d0fb3e2b42a56f679d7c59ad4358ce7d5)

Author SHA1 Message Date
yxw 6e90772d0f 裁片箱条码打印 10 months ago
yxw babf855266 Merge remote-tracking branch 'origin/dev-wuhan' 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 a6a399205d 裁片箱条码打印 10 months ago
yxw 226ee0be3f 裁片方案、工单增加属性 10 months ago
jun b387f9c11e 增加常量3定义 10 months ago
jun c454fa84a3 Merge remote-tracking branch 'origin/dev-wuhan' 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
jun e931661d01 包装解绑功能开发 10 months ago
yxw 5ea796fb79 裁片打印工步 10 months ago
王杰 984a761881 前道防错, 顺序防错 逻辑调整 10 months ago
王杰 da07938e34 扫描主条码 工步 剔除排序场景 10 months ago
王杰 d51bcd2278 排序 显示装配件扫描项 10 months ago
yxw 63cd8c2671 裁片功能 10 months ago
yxw 70de9c9b15 裁片功能-》弹框展示成品列表Function 10 months ago
yxw 4b6d081ede Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw f105f37d7f 裁片功能-》弹框展示成品列表Function 10 months ago
王杰 89c1240140 合并dev 10 months ago
jun aae08f45b1 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
jun 33cbf3d537 等离子功能开发 10 months ago
gsz 03bf31ef50 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 10 months ago
gsz bc7d209620 SPS物料拉动PCN扫描页面1 10 months ago
jun 96f6e5cdd6 返工拆解逻辑调整 10 months ago
王杰 2314130e5a 上下文 物料 10 months ago
王杰 2af9d8f125 工步弹框 10 months ago
jun bf49601ad1 扫描可回用包装开发 10 months ago
yxw ae725102b7 保存裁片加工记录 10 months ago
王杰 59fc125885 通用顺序防错工步 10 months ago
jun fd46d3ab15 发运跳过逻辑优化 10 months ago
yxw b3c75bb50a Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw 1e8f6672cf 裁片功能 10 months ago
jun 2ef4f1e2f0 料包绑定功能开发 10 months ago
王杰 8d704d6a9e 排序顺序防错 10 months ago
yxw 2a6bcfc4dc Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw 487c627bf8 裁片工单生成问题修复 10 months ago
王杰 f894210e6f Merge branch 'dev' into dev-wuhan 10 months ago
王杰 ba80057ac8 读设备数据 写日志 增加 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
王杰 f9a1e5322e Merge branch 'dev' into dev-wuhan 10 months ago
jun bc60e1a2c1 电子化检验拆解功能开发 10 months ago
yxw 9f6afe14fd 解决代码冲突 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