jiaxin.lin
/
i3plus-mes-pcn-yfai
forked from I3-YF/i3plus-mes-pcn-yfai
1
0
Fork 0
Code Pull Requests Activity
1,340 Commits
55 Branches
28 Tags
11 MiB
uat-temp-wj-chongqingdaqu-dev
uat-temp-wj-2502060000-chongqing-step
uat-temp-nht-2503130000-chengdu-shipping
uat-temp-wj-chongqingdaqu-prod
uat-temp-wj-chongqingdaqu-dev-temp-logic-20250313-45623
dev
uat-temp-nht-25027-chengdu
dev_temp_xw_202503120000_45558
uat-temp-nht-2503100000-45420
uat-temp-nht-2503110000-45555
uat-temp-wj-shenshanorder
uat-temp-nht-2503110000-45556
uat-temp-logic-20250307-45527
uat-temp-wj-chongqingdaqu
dev_temp_xw_202503100000_45411
uat-temp-nht-2503100000-45560
uat-temp-castle-2502241152-fordFetchWeb
uat-temp-nht-2502110000-chongqing-step
uat-temp-logic-20250309-45550
uat-temp-nht-2502140000-part-print
dev_temp_xw202503020000_45316
uat
test
uat-temp-nht-250226-lijia
uat-temp-wj-lijia-prod
uat-temp-nht-202502180000-shippingkanban
uat-temp-nht-202502270000-45335
test-temp-wj-45329
uat-temp-nht-202502260000-customprint
dev-temp-xw-202502170000-45135
uat_temp_xw_202502100000_44424
uat-temp-wj-longxin-prod
dev-temp-nht-202502180000-customprint
uat-temp-nht-2502200000-lijia-sn-print
uat-temp-xw-20250220-45119
dev-temp-xw-202502170000-111111
uat-work-order-temp
uat-temp-nht-2502110000-45028
test-temp-wj-2501170000-44435
uat_temp_castle_250213_44248
uat-temp-castle-250211-44248
uat_temp-xw-202502110000-45034
uat-temp-castle-250209-kitting
dev-temp-xw-202502050000-44881
uat-temp-wj-250210-45015
uat-temp-wj-250208-manycellbug
uat-temp-wj-250208-44424
uat-temp-nht-2502060000-44953
uat-temp-wj-250124-equ-check-step
uat-temp-xw-202501250000-44863
test-temp-wj-250117-pack
test-demp-ljs-202501181621-44904
dev-temp-nht-202501160000-44744
dev-temp-xw-202501150000-44838
master
yfai-pcn-ext-v3.2
yfai-pcn-ext-v3.11
yfai-pcn-ext-v3.1
yfai-pcn-ext-v2.9
yfai-pcn-ext-v2.82
yfai-pcn-ext-v2.81
yfai-pcn-ext-v2.8
yfai-pcn-ext-v2.76
yfai-pcn-ext-v2.75
yfai-pcn-ext-v2.7
yfai-pcn-ext-v2.6
yfai-pcn-ext-v2.51
yfai-pcn-ext-v2.5
yfai-pcn-ext-v2.4
yfai-pcn-ext-v2.3
yfai-pcn-ext-v2.2
yfai-pcn-ext-v2.1
yfai-pcn-ext-v2.0
yfai-pcn-ext-v1.9
yfai-pcn-ext-v1.8
yfai-pcn-ext-v1.7
yfai-pcn-ext-v1.6
yfai-pcn-ext-v1.5
yfai-pcn-ext-v1.4
yfai-pcn-ext-v1.3
yfai-pcn-ext-v1.2
yfai-pcn-ext-v1.1
yfai-pcn-ext-v1.0
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'dae94f2c07'
${ noResults }
Commit Graph

1326 Commits (dae94f2c07de9be90557f65f6884325ca9b7b3f9)

Author SHA1 Message Date
xiangwei.zhang 70456a3df5 Merge remote-tracking branch 'origin/dev' into dev 8 months ago
xiangwei.zhang 3d9b4e6aa2 判断可疑 8 months ago
王杰 9b685988ed Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
yxw 19dc318f2f Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw bd4d547f4b 保存裁片工单结果工步-裁片工单号获取方式修改 8 months ago
王杰 3e11aff239 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 8 months ago
王杰 1cb80d9451 merge dev pom冲突 8 months ago
yxw c8576f6f92 1、MesProductionPartContext 增加cutQty（裁片工单数量） 
2、裁片工单绑定问题修复
 8 months ago
yxw 0f3a1cb964 1、MesProductionPartContext 增加cutQty（裁片工单数量） 
2、裁片工单绑定问题修复
 8 months ago
王杰 947fa99b48 工位扫描 监控日志信息 设备代码判空补字段值 8 months ago
xiangwei.zhang f2a453f549 判断可疑 8 months ago
王杰 df5757bec8 排序 保存加工结果 8 months ago
yxw d1b5e32076 非排序产出零件条码 去掉cutWorkOrderNo 字段 8 months ago
yxw fac38e24c5 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw bdceeb26f5 排序展示组件开发 8 months ago
gsz c94b44ceee Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 8 months ago
gsz 176b418709 排序返工作业2 8 months ago
王杰 f441b07b4b 上下文 获取生产线类型 不验证工序 8 months ago
王杰 5e2d89d6af Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
王杰 c5ef060b85 Merge branch 'dev' 8 months ago
王杰 4e94622cfd Merge branch 'dev' into dev-wuhan 8 months ago
王杰 c39b5a9ab1 排序 保存工单装配件 8 months ago
yxw 30082cc4ae 裁片工步修改： 
1、加工规则匹配时，对进料条件封装foreignKey
2、保存裁片条码工步取消引用保存条码工步，改为在本工步实现根据是否存在进料条码保存条码逻辑
3、裁片工单号存值改为产出零件上下文中
 8 months ago
王杰 51bf7e01ec Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 8 months ago
王杰 d8cabab1d8 展示组件 8 months ago
yxw 63dbcf1eb0 装配目视单预览 8 months ago
yxw 16ee98410f 装配目视单打印 8 months ago
yxw 6efdf95220 装配目视单打印 8 months ago
王杰 413f68de13 保存加工结果 排序 8 months ago
gsz a25a8b92e0 排序返工作业1 8 months ago
gsz 007256524b Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 8 months ago
gsz 5fb9601736 JIS物料拉动演示问题修改 8 months ago
jun 78f398a7fb 排序发运演示问题修复 8 months ago
jun 3218721983 排序发运功能开发 8 months ago
yxw 75edad4f97 装配目视单预览 8 months ago
jun b026ee071c Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
jun fc3e0bab38 排序发运功能开发 8 months ago
gsz 2bb948e6c4 JIS物料拉动PCN 修改根据工单号排序校验 8 months ago
yxw ffbc8c888d Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
yxw 01e7e45737 装配目视单打印 8 months ago
yxw 8ed36a5e6b Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw a9e45c3a00 装配目视单打印 8 months ago
王杰 7ae9519b26 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 8 months ago
王杰 7e795f15d2 排序 保存加工结果 8 months ago
gsz 361eb7e455 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 8 months ago
gsz 0aafab31c8 排序电子化检验支持加工单扫描或者加工单客户条码1 8 months ago
yxw 7d68d9f4f9 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 8 months ago
yxw 9453928bf8 Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
yxw 2b1e11ebf9 装配目视单打印 8 months ago
xiangwei.zhang c210f5e8b2 判断可疑 8 months ago
王杰 9695bfae11 Merge branch 'master' into dev-wuhan-temp 8 months ago
王杰 a431455f9f 保存工艺参数工步 8 months ago
yxw bc534df0ec 装配目视单打印 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 aad6e2dd48 装配目视单打印 8 months ago
yxw ae996c361c PCN根据产线查询零件生产组信息集合 8 months ago
yxw 798ec0d3ff Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw 91f6148ac7 新增打印工单打印队列 8 months ago
王杰 949da88cea Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
王杰 97ada9a13c 合并冲突 8 months ago
王杰 857f7c4fc2 Merge branch 'master' into dev-wuhan-temp 8 months ago
王杰 abd4a0546f 漏信号 改LOG状态增加修改时间条件 8 months ago
王杰 3215c2957e 漏信号 改LOG状态增加修改时间条件 8 months ago
王杰 ce2dc13c8b jdbc连接url增加allowMultiQueries=true 8 months ago
王杰 543e006ff3 Merge branch 'master' into dev-wuhan-temp 8 months ago
王杰 8b70f63423 漏信息问题修复 8 months ago
王杰 0ea80b7ea0 Merge branch 'master' into dev-wuhan-temp 8 months ago
王杰 42c5101d09 漏信号 8 months ago
王杰 c95c16fdcb Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
王杰 99437630bf 非排序无显示装配件匹配工步 8 months ago
王杰 8a9d4d55c8 Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
王杰 fb713f5e5d Merge branch 'master' into dev-wuhan-temp 8 months ago
王杰 d84adae7f5 漏信号 代码修改 8 months ago
王杰 8655825afc 弹框工步 8 months ago
王杰 70cca89c41 Merge branch 'master' into dev-wuhan-temp 8 months ago
王杰 8c5c959c3a 漏信号 bug 8 months ago
王杰 2c196e4f47 显示装配件 json to string 序列号 null 异常处理 8 months ago
王杰 4e2056d1fa Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
王杰 7f7c46d92e 显示装配件 json to string 序列号 null 异常处理 8 months ago
王杰 0c1bfef981 Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
yxw def629d6a2 排序产线工单发布新增装配目视单打印队列 8 months ago
王杰 672df80254 漏信号 代码 报错 问题修复 查询id bigint 转long 8 months ago
王杰 6f590edc81 Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
yxw d8bbb932a9 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw 5c1e7a1124 30.6配置文件密码修改 8 months ago
王杰 825891b51a 漏信号 代码 报错 问题修复 查询id bigint 转long 8 months ago
王杰 1fb16f0457 排序 根据工单或者客户条码 获取工单或者条码 8 months ago
王杰 6b99d852d7 合并 冲突 8 months ago
王杰 1a05d6deb5 Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
王杰 d94723f1d3 排序 匹配装配件工步 8 months ago
王杰 05038cf65c 排序 匹配装配件工步 8 months ago
yxw b1905b75e3 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw 70d83d76c7 打印队列表 8 months ago
jun 63493c7fd9 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
jun 9ceb874f19 通用包装组零件校验(VKM)功能开发 8 months ago
yxw 89e087632e 电子化检验弹框数据处理 8 months ago
yxw bbf6577607 电子化检验弹框数据处理 8 months ago
yxw 3acc35c0ab 电子化检验弹框数据处理 8 months ago
yxw db81a86fe7 电子化检验弹框数据处理 8 months ago
yxw 764744cba5 电子化检验弹框数据处理 8 months ago
王杰 2dcadee21b 工步弹框 8 months ago
王杰 1988ac9e83 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 8 months ago
王杰 e22a91f580 排序 匹配工步 8 months ago
yxw de08e40843 裁片工单打印 8 months ago
王杰 8e81257831 排序 匹配装配件工步 8 months ago
yxw ca1aa4a652 裁片工单打印优化 8 months ago
gsz 8290261d5b JIS物料拉动PCN页面2 8 months ago
yxw 188741a4dd Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw 04e7942d04 裁片原材料防错优化 8 months ago
王杰 ba1a743d20 Merge branch 'master' into dev-wuhan-temp 8 months ago
gsz 0113527434 JIS物料拉动PCN页面2 8 months ago
王杰 bbd0f74b5c Merge branch 'dev' 8 months ago
yxw b578de2b1a Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw 82a6beef27 MesPcnExtConstWords VERTICAL_BAR 参数名更改 8 months ago
王杰 a149c7cb55 Merge branch 'dev' into dev-wuhan 8 months ago
yxw 0957d7c212 PCN裁片工单打印 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
王杰 08aa3def34 打印非报废条码工步 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
yxw 0e5b02c65d Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
jun 739136d035 查询bom增加生效开始时间分组 8 months ago
yxw 550fcee7aa 裁片功能优化 8 months ago
王杰 8f3dd7bc9b 排序 显示前道所有装配件扫描项 8 months ago
yxw e9d2615935 裁片功能优化 8 months ago
yxw ab9f3dde09 裁片功能优化 8 months ago
yxw e783d75ae2 裁片功能优化 8 months ago
xiangwei.zhang 213e349773 新增bomCode 8 months ago
jun d2d1d98281 43072 加料防错 料箱自动初始化 8 months ago
jun 2322cc606c 43063 PDA点检重复扫描了同一个条码，希望提示清晰 8 months ago
yxw ab3fd934cf Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw 312a57c4be 裁片工单标签打印接口开发 8 months ago
jun ca7e6bb915 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
jun f4ebfa030e 包装解绑功能开发 8 months ago
yxw e798943bfe 裁片工单标签打印工步修改 8 months ago
yxw cab28f1ba8 裁片箱标签打印参数增加时间 8 months ago
yxw 8a0ccc46f9 裁片箱条码打印工步增加修改裁片工单状态为已打印逻辑 8 months ago
yxw 6e90772d0f 裁片箱条码打印 8 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
 8 months ago
yxw a6a399205d 裁片箱条码打印 8 months ago
yxw 226ee0be3f 裁片方案、工单增加属性 8 months ago
jun b387f9c11e 增加常量3定义 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
yxw c658a8a5b8 裁片打印策略类 8 months ago
yxw 5ea796fb79 裁片打印工步 8 months ago
王杰 d83d750632 排序装配件确认方式：通用自制件补条码字符 8 months ago
王杰 984a761881 前道防错， 顺序防错 逻辑调整 8 months ago
王杰 da07938e34 扫描主条码 工步 剔除排序场景 8 months ago
王杰 ac408df8b5 排序 设备加工参数工步 8 months ago
王杰 c5d1382724 生产线增加字段 是否忽略 工单质量状态 8 months ago
王杰 d51bcd2278 排序 显示装配件扫描项 8 months ago
王杰 f1f1d8fcdf 前道防错 8 months ago
王杰 ebc7bcd0b4 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 8 months ago
王杰 377e8aa2e9 工步弹框 8 months ago
yxw 63cd8c2671 裁片功能 8 months ago
yxw 641c881f94 裁片功能-》弹框展示成品列表Function 8 months ago
xiangwei.zhang 55984cee69 判断可疑 8 months ago
yxw 70de9c9b15 裁片功能-》弹框展示成品列表Function 8 months ago
yxw b99fded8f5 裁片功能-》弹框展示成品列表Function 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 b36912724c SPS物料拉动PCN扫描页面2 8 months ago
gsz bb2a3f1092 43010 PNC增加装配件查询 8 months ago
jun 2f3b3b0761 number同时存在大于小于某个字段问题修复 8 months ago
jun aae08f45b1 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
jun 33cbf3d537 等离子功能开发 8 months ago
gsz 430d3556da 把拉动单打印产线 拉动组多选 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 96f6e5cdd6 返工拆解逻辑调整 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
王杰 5e1f6de520 工步弹框 8 months ago
王杰 2af9d8f125 工步弹框 8 months ago
jun 59c44cb199 发运单，装车单跳过逻辑调整 8 months ago
jun 17a2254f3a 站点信息基础数据 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 0cd56db811 返工代码优化 8 months ago
jun 91ff86f2d3 返工完成方法名事务问题修改 8 months ago
yxw 428e0bdce6 修改原材料长度 8 months ago
jun a63247efc8 返工拆解inspection表里，nc_status增加拆解功能 8 months ago
jun 8a08eaaf53 发运单中默认不写装车单信息，需要反查 8 months ago
jun fd46d3ab15 发运跳过逻辑优化 8 months ago
yxw 54bc6daf7f Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw add6da8105 修复原材料防错记录修改长度履历时修改类型不对问题 8 months ago
王杰 1cfe0f53c0 Merge branch 'dev' into dev-wuhan 8 months ago
王杰 959eb9aa11 设备计数验证shotCounter 8 months ago
yxw b3c75bb50a Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw 1e8f6672cf 裁片功能 8 months ago
jun 05d89d34bb Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
jun 2ef4f1e2f0 料包绑定功能开发 8 months ago
yxw df3f552348 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw f6e0ae2118 裁片原材料防错增加长度修改记录 8 months ago
王杰 5cf100bce8 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 8 months ago
王杰 c2b94c2ad6 生成零件号 可复用 8 months ago
王杰 b2325f6ce0 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 8 months ago
王杰 8d704d6a9e 排序顺序防错 8 months ago
yxw 65b902f4ba Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw 82db0d1594 10.193.30.22 服务器配置文件 8 months ago
jun b98c50a6e8 Merge remote-tracking branch 'origin/dev' into dev 8 months ago
jun 408911ff1b 返工拆解，查询树形装配件，增加id,pid关联 8 months ago
王杰 3cf7ef6096 Merge branch 'dev' into dev-wuhan 8 months ago
王杰 8789532066 PcnRepositoryAspect 8 months ago
jun d76ad89328 Merge remote-tracking branch 'origin/dev' into dev 8 months ago
jun 3a5e4d844e 重新检测生成单据，同步标识重置 8 months ago
gsz 58811fff06 42984 初检创建时修改人和修改时间不能赋值 8 months ago
yxw 78514c8beb Merge remote-tracking branch 'origin/dev' into dev-wuhan 8 months ago
yxw 2a6bcfc4dc Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw 487c627bf8 裁片工单生成问题修复 8 months ago
jun adfcb960c9 Merge remote-tracking branch 'origin/dev' into dev 8 months ago
jun a4a612bd9c 点检单同步标识未修改 8 months ago
王杰 f894210e6f Merge branch 'dev' into dev-wuhan 8 months ago
王杰 0c88633bfa 删除无用的备份工步 8 months ago
王杰 90e6ff708d Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 8 months ago
王杰 ba80057ac8 读设备数据 写日志 增加 8 months ago
jun 05ccf6501f Merge remote-tracking branch 'origin/dev' into dev 8 months ago
jun b731d10d44 电子化检验拆解功能开发 8 months ago
yxw bcf15b1eaa 修改原材料修改记录表 8 months ago
yxw d5d51e0585 Merge remote-tracking branch 'origin/dev' into dev-wuhan 8 months ago
王杰 fae918112f Merge branch 'dev' into dev-wuhan 8 months ago
王杰 f06716eec8 生产零件号 可复用 报错 问题修复 8 months ago
王杰 a2c80f138d 代码写错 8 months ago
王杰 f9a1e5322e Merge branch 'dev' into dev-wuhan 8 months ago
王杰 27b40d6709 设备查询点位数据去除事务 8 months ago
jun bc60e1a2c1 电子化检验拆解功能开发 8 months ago
yxw 9f6afe14fd 解决代码冲突 8 months ago
yxw 92f9a79e97 PCN长度修改类型获取接口 8 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
 8 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
 8 months ago
jun 5a6b1f1d2a Merge remote-tracking branch 'origin/dev' into dev 8 months ago
yxw 9b018ceb28 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw a8db4e761c 裁片原材料防错 8 months ago
yxw 6537f792ef 裁片原材料防错 8 months ago
jun 43ba2569c1 非排序拆解功能 8 months ago
王杰 a5dd6cf0f3 常量 睡眠2s改500ms 8 months ago
王杰 8e321c50ff wuhan 工单 工步 8 months ago
xiangwei.zhang 25b01eb43c 判断可疑 9 months ago