Commit Graph

275 Commits (7d68d9f4f9843a35f2f6fc2d99e70d4c8397d4f8)

Author SHA1 Message Date
王杰 9695bfae11 Merge branch 'master' into dev-wuhan-temp 8 months ago
王杰 a431455f9f 保存工艺参数工步 8 months ago
王杰 98843e2581 Merge branch 'master' into dev-wuhan-temp 8 months ago
王杰 c403807421 Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
王杰 40f8d63189 设备点检 8 months ago
yxw ae996c361c PCN根据产线查询零件生产组信息集合 8 months ago
yxw 91f6148ac7 新增打印工单打印队列 8 months ago
王杰 857f7c4fc2 Merge branch 'master' into dev-wuhan-temp 8 months ago
王杰 3215c2957e 漏信号 改LOG状态增加修改时间条件 8 months ago
王杰 6f590edc81 Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
王杰 1fb16f0457 排序 根据工单或者客户条码 获取工单或者条码 8 months ago
王杰 1a05d6deb5 Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
王杰 05038cf65c 排序 匹配装配件工步 8 months ago
王杰 ba1a743d20 Merge branch 'master' into dev-wuhan-temp 8 months ago
王杰 bbd0f74b5c Merge branch 'dev' 8 months ago
王杰 a149c7cb55 Merge branch 'dev' into dev-wuhan 8 months ago
yxw 3c60fd4487 PCN裁片工单打印 8 months ago
yxw a78238b49c Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw e476c0c4dc 裁片相关pojo修改 8 months ago
gsz c8895560b5 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 8 months ago
gsz 932f06d023 JIS物料拉动PCN页面1 8 months ago
王杰 8f3dd7bc9b 排序 显示前道所有装配件扫描项 8 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
8 months ago
jun e931661d01 包装解绑功能开发 8 months ago
王杰 f1f1d8fcdf 前道防错 8 months ago
xiangwei.zhang 55984cee69 判断可疑 8 months ago
yxw 4b6d081ede Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw f105f37d7f 裁片功能-》弹框展示成品列表Function 8 months ago
王杰 89c1240140 合并dev 8 months ago
王杰 49549429cb 漏信号 优化 8 months ago
gsz bb2a3f1092 43010 PNC增加装配件查询 8 months ago
jun aae08f45b1 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
jun 33cbf3d537 等离子功能开发 8 months ago
gsz 03bf31ef50 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 8 months ago
gsz bc7d209620 SPS物料拉动PCN扫描页面1 8 months ago
jun 023203efaf Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
jun 8680ee4e9b 原箱进原箱出逻辑开发 8 months ago
王杰 2314130e5a 上下文 物料 8 months ago
jun e22af55524 装车单跳过,是否要将装车单关联的发运单也一并完成,同时一并发给WMS 8 months ago
jun bf49601ad1 扫描可回用包装开发 8 months ago
yxw 47dee04a69 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw ae725102b7 保存裁片加工记录 8 months ago
jun d883d077fd 料包绑定增加外协件逻辑 8 months ago
王杰 59fc125885 通用顺序防错工步 8 months ago
jun 91ff86f2d3 返工完成方法名事务问题修改 8 months ago
王杰 1cfe0f53c0 Merge branch 'dev' into dev-wuhan 8 months ago
yxw b3c75bb50a Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw 1e8f6672cf 裁片功能 8 months ago
jun 2ef4f1e2f0 料包绑定功能开发 8 months ago
王杰 c2b94c2ad6 生成零件号 可复用 8 months ago