Commit Graph

1060 Commits (a25a8b92e0746648936fd71c4d157184f8e7fbb6)

Author SHA1 Message Date
yxw 82a6beef27 MesPcnExtConstWords VERTICAL_BAR 参数名更改 9 months ago
王杰 a149c7cb55 Merge branch 'dev' into dev-wuhan 9 months ago
yxw 0957d7c212 PCN裁片工单打印 9 months ago
yxw 3c60fd4487 PCN裁片工单打印 9 months ago
yxw a78238b49c Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
yxw e476c0c4dc 裁片相关pojo修改 9 months ago
王杰 08aa3def34 打印非报废条码工步 9 months ago
gsz c8895560b5 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 9 months ago
gsz 932f06d023 JIS物料拉动PCN页面1 9 months ago
yxw 0e5b02c65d Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
jun 739136d035 查询bom增加生效开始时间分组 9 months ago
yxw 550fcee7aa 裁片功能优化 9 months ago
王杰 8f3dd7bc9b 排序 显示前道所有装配件扫描项 9 months ago
yxw e9d2615935 裁片功能优化 9 months ago
yxw ab9f3dde09 裁片功能优化 9 months ago
yxw e783d75ae2 裁片功能优化 9 months ago
xiangwei.zhang 213e349773 新增bomCode 9 months ago
jun d2d1d98281 43072 加料防错 料箱自动初始化 9 months ago
jun 2322cc606c 43063 PDA点检重复扫描了同一个条码,希望提示清晰 10 months ago
yxw ab3fd934cf Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw 312a57c4be 裁片工单标签打印接口开发 10 months ago
jun ca7e6bb915 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
jun f4ebfa030e 包装解绑功能开发 10 months ago
yxw e798943bfe 裁片工单标签打印工步修改 10 months ago
yxw cab28f1ba8 裁片箱标签打印参数增加时间 10 months ago
yxw 8a0ccc46f9 裁片箱条码打印工步增加修改裁片工单状态为已打印逻辑 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 c658a8a5b8 裁片打印策略类 10 months ago
yxw 5ea796fb79 裁片打印工步 10 months ago
王杰 d83d750632 排序装配件确认方式:通用自制件补条码字符 10 months ago
王杰 984a761881 前道防错, 顺序防错 逻辑调整 10 months ago
王杰 da07938e34 扫描主条码 工步 剔除排序场景 10 months ago
王杰 ac408df8b5 排序 设备加工参数工步 10 months ago
王杰 c5d1382724 生产线增加字段 是否忽略 工单质量状态 10 months ago
王杰 d51bcd2278 排序 显示装配件扫描项 10 months ago
王杰 f1f1d8fcdf 前道防错 10 months ago
王杰 ebc7bcd0b4 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 10 months ago
王杰 377e8aa2e9 工步弹框 10 months ago
yxw 63cd8c2671 裁片功能 10 months ago
yxw 641c881f94 裁片功能-》弹框展示成品列表Function 10 months ago
xiangwei.zhang 55984cee69 判断可疑 10 months ago
yxw 70de9c9b15 裁片功能-》弹框展示成品列表Function 10 months ago
yxw b99fded8f5 裁片功能-》弹框展示成品列表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
gsz b36912724c SPS物料拉动PCN扫描页面2 10 months ago
gsz bb2a3f1092 43010 PNC增加装配件查询 10 months ago
jun 2f3b3b0761 number同时存在大于小于某个字段问题修复 10 months ago
jun aae08f45b1 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
jun 33cbf3d537 等离子功能开发 10 months ago
gsz 430d3556da 把拉动单打印产线 拉动组多选 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
jun 023203efaf Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
jun 8680ee4e9b 原箱进原箱出逻辑开发 10 months ago
王杰 2314130e5a 上下文 物料 10 months ago
王杰 5e1f6de520 工步弹框 10 months ago
王杰 2af9d8f125 工步弹框 10 months ago
jun 59c44cb199 发运单,装车单跳过逻辑调整 10 months ago
jun 17a2254f3a 站点信息基础数据 10 months ago
jun e22af55524 装车单跳过,是否要将装车单关联的发运单也一并完成,同时一并发给WMS 10 months ago
jun bf49601ad1 扫描可回用包装开发 10 months ago
yxw 47dee04a69 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw ae725102b7 保存裁片加工记录 10 months ago
jun d883d077fd 料包绑定增加外协件逻辑 10 months ago
王杰 59fc125885 通用顺序防错工步 10 months ago
jun 0cd56db811 返工代码优化 10 months ago
jun 91ff86f2d3 返工完成方法名事务问题修改 10 months ago
yxw 428e0bdce6 修改原材料长度 10 months ago
jun a63247efc8 返工拆解inspection表里,nc_status增加拆解功能 10 months ago
jun 8a08eaaf53 发运单中默认不写装车单信息,需要反查 10 months ago
jun fd46d3ab15 发运跳过逻辑优化 10 months ago
yxw 54bc6daf7f Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw add6da8105 修复原材料防错记录修改长度履历时修改类型不对问题 10 months ago
王杰 1cfe0f53c0 Merge branch 'dev' into dev-wuhan 10 months ago
王杰 959eb9aa11 设备计数验证shotCounter 10 months ago
yxw b3c75bb50a Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw 1e8f6672cf 裁片功能 10 months ago
jun 05d89d34bb Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
jun 2ef4f1e2f0 料包绑定功能开发 10 months ago
yxw df3f552348 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw f6e0ae2118 裁片原材料防错增加长度修改记录 10 months ago
王杰 5cf100bce8 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 10 months ago
王杰 c2b94c2ad6 生成零件号 可复用 10 months ago
王杰 b2325f6ce0 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 10 months ago
王杰 8d704d6a9e 排序顺序防错 10 months ago
yxw 65b902f4ba Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw 82db0d1594 10.193.30.22 服务器配置文件 10 months ago
jun b98c50a6e8 Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun 408911ff1b 返工拆解,查询树形装配件,增加id,pid关联 10 months ago
王杰 3cf7ef6096 Merge branch 'dev' into dev-wuhan 10 months ago
王杰 8789532066 PcnRepositoryAspect 10 months ago