Commit Graph

345 Commits (98843e25814fa2e4700811739d447affc2e3d61f)

Author SHA1 Message Date
王杰 98843e2581 Merge branch 'master' into dev-wuhan-temp 10 months ago
王杰 c403807421 Merge branch 'dev-wuhan' into dev-wuhan-temp 10 months ago
王杰 40f8d63189 设备点检 10 months ago
yxw aad6e2dd48 装配目视单打印 10 months ago
yxw 91f6148ac7 新增打印工单打印队列 10 months ago
王杰 857f7c4fc2 Merge branch 'master' into dev-wuhan-temp 10 months ago
王杰 3215c2957e 漏信号 改LOG状态增加修改时间条件 10 months ago
王杰 70cca89c41 Merge branch 'master' into dev-wuhan-temp 10 months ago
王杰 8c5c959c3a 漏信号 bug 10 months ago
王杰 4e2056d1fa Merge branch 'dev-wuhan' into dev-wuhan-temp 10 months ago
王杰 7f7c46d92e 显示装配件 json to string 序列号 null 异常处理 10 months ago
王杰 0c1bfef981 Merge branch 'dev-wuhan' into dev-wuhan-temp 10 months ago
yxw def629d6a2 排序产线工单发布新增装配目视单打印队列 10 months ago
王杰 825891b51a 漏信号 代码 报错 问题修复 查询id bigint 转long 10 months ago
王杰 1a05d6deb5 Merge branch 'dev-wuhan' into dev-wuhan-temp 10 months ago
王杰 05038cf65c 排序 匹配装配件工步 10 months ago
jun 63493c7fd9 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
jun 9ceb874f19 通用包装组零件校验(VKM)功能开发 10 months ago
王杰 e22a91f580 排序 匹配工步 10 months ago
王杰 8e81257831 排序 匹配装配件工步 10 months ago
yxw ca1aa4a652 裁片工单打印优化 10 months ago
王杰 ba1a743d20 Merge branch 'master' into dev-wuhan-temp 10 months ago
yxw 3c60fd4487 PCN裁片工单打印 10 months ago
王杰 8f3dd7bc9b 排序 显示前道所有装配件扫描项 10 months ago
yxw 312a57c4be 裁片工单标签打印接口开发 10 months ago
yxw cab28f1ba8 裁片箱标签打印参数增加时间 10 months ago
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
王杰 49549429cb 漏信号 优化 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