jiaxin.lin
/
i3plus-mes-pcn-yfai
forked from I3-YF/i3plus-mes-pcn-yfai
1
0
Fork 0
Code Pull Requests Activity
1,464 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 '0850df7369'
${ noResults }
Commit Graph

1450 Commits (0850df73696a05a1eb8ef64d614cac899c251738)

Author SHA1 Message Date
臧学普 98589ffecb Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 7 months ago
臧学普 4599f24b25 重构sps代码 7 months ago
jun be0b341aed 天桥数报表开发 7 months ago
王杰 0c7016e070 点位表 接口逻辑表 修改时间 没有值 导致程序报错 问题修复 7 months ago
王杰 96c55eaad5 排序装配件 保存 记录 bug 修复 7 months ago
jun 3f876fadc7 非排序CBR汇报 7 months ago
臧学普 99ab2c2d85 重构sps代码 7 months ago
臧学普 12ca42f386 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 7 months ago
臧学普 42653ea0fd 重构sps代码 7 months ago
jun 84361a3027 查询条件没加工厂代码排查 7 months ago
臧学普 5c53be2c16 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesPullingOrderInfoService.java
 7 months ago
臧学普 08b0b58982 重构sps代码 7 months ago
王杰 bc8533f0c8 装配件 唯一性 验证 增加 模内验证 7 months ago
jun 827ba97c7b 应急件库位管理演示问题修复 7 months ago
xiangwei.zhang bf5f6b5c99 设备停机修改 7 months ago
jun e2433f1a78 打印模板调整 7 months ago
王杰 f021479878 采集数据 trim 7 months ago
王杰 dac4971115 客户订单号防错工步 7 months ago
jun da7c2b31bd Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 7 months ago
jun b1f27d6e72 SPS 生成webservice从MES换到PCN 7 months ago
王杰 f1dc9cd261 武汉 非排序 增加打印策略 7 months ago
jun c6bc7781b2 SPS 生成webservice从MES换到PCN 7 months ago
王杰 4b087ed17b 代码优化 7 months ago
jun 62eecf9af4 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 7 months ago
jun 9bfa68401e 排序发运逻辑调整 7 months ago
王杰 cddd64250b 装配件 匹配后 前端列表滚动条自动定位 7 months ago
王杰 7767805389 离线版本 7 months ago
jun 5830b0452b 非排序产线打印客户条码信息 7 months ago
jun 7008d4fea3 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 7 months ago
jun 18b4d11e9b CBR报工逻辑调整 7 months ago
王杰 42241d7411 发送设备加工参数 固定值 不转大写 判断依据是否包含百分号 7 months ago
jun be81832476 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 7 months ago
jun 2579987543 等离子工步写入数据耗时较长 7 months ago
王杰 bd72537b82 工单 生产顺序号 字段 pojo 属性名变更 数据库字段不变 7 months ago
王杰 25cabf46bb 生产工单 重复的 生产时间字段 上下线时时间 临时写值 后续统一改 7 months ago
王杰 5c3fcc53d2 生产工单 重复的 生产时间字段 上下线时时间 临时写值 后续统一改 7 months ago
臧学普 13cb24991d Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 7 months ago
臧学普 92fb626bd8 优化电测试-增加生产记录修改 7 months ago
王杰 c82473c72a 排序 装配件前置写库 7 months ago
王杰 b170bd66f2 代码优化 7 months ago
王杰 e1c3021899 代码优化 7 months ago
王杰 7993912d8b merge dev-wuhan 7 months ago
王杰 b7b4ecb676 merge dev 7 months ago
王杰 5af8d8faf8 Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
jun 172047542c Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 7 months ago
jun 176fb4505f 应急件库位管理开发 7 months ago
王杰 253b5fd638 Merge branch 'dev-wuhan-temp' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan-temp 7 months ago
王杰 0d1769c17c 排序 装配件 前置写库 7 months ago
臧学普 7a1b06614d 优化电测试-增加生产记录修改 7 months ago
xiangwei.zhang bd26b7762b 设备停机修改 7 months ago
王杰 5b773eb9b5 排序 装配件 实时落库 7 months ago
臧学普 d8affd4048 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 7 months ago
臧学普 ec226284ea 优化电测试-增加生产记录 7 months ago
jun 0fe1ca2ebf JIS拉动，要加跳过码，标记是跳过的 7 months ago
jun 3a187b0bf1 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 7 months ago
jun 3752c50f24 生产过程控制，排序加工单显示(跳号标黄色) 7 months ago
王杰 d3b21da384 Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
王杰 7e7304ec8d 排序 装配件 问题 7 months ago
jun d709c834d5 Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
臧学普 54caad459e Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 7 months ago
臧学普 409c979c0e 优化电测试 7 months ago
xiangwei.zhang aff7c237e9 设备停机修改 7 months ago
jun 428a3d8884 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 7 months ago
jun 5c758f33c0 生产过程控制，标黄的是跳号的工单，而不是有跳过的工单。 7 months ago
jun 31de710227 客户条码补打 7 months ago
王杰 5bfb403b48 Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
王杰 e92c29a07a 装配件扫描 置顶 7 months ago
臧学普 b8ec695def 电测试 7 months ago
臧学普 2ab2ecdb80 电测试 7 months ago
jun e6aa6deb48 流程包含解绑工步[工步参数]逻辑优化 7 months ago
jun 8419842a17 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan-temp 7 months ago
jun e67dd0fe8d Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 7 months ago
jun e531d140ae CBR,排序报工逻辑调整 7 months ago
王杰 34e0e40256 Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
王杰 c7a5f904a0 代码优化 7 months ago
王杰 b118f22767 Merge branch 'master' into dev-wuhan-temp 7 months ago
王杰 5ab9d9098b 工艺参数完成 动态sql写入 7 months ago
gsz 8cb8b90b15 SPS拉动不校验强过顺序的 7 months ago
王杰 5bd431ac55 装配件显示 列增加配置 7 months ago
jun 7a4df0d184 排序发运逻辑调整 7 months ago
jun 254687ff81 第一次记录加工记录，同步标识应该为2 7 months ago
臧学普 e8b651168f Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 7 months ago
臧学普 1ebb40569f 电测试 7 months ago
gsz 8d832557c4 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 7 months ago
gsz 84e6e65172 SPS单据打印插入PrintedSnLog表 7 months ago
jun be37923e97 排序报工演示问题修复 7 months ago
xiangwei.zhang f30dea31ba 合并广州代码 7 months ago
xiangwei.zhang a2c4488860 Merge branch 'dev' into dev-wuhan 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesReportNoSortStepService.java
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesReportSortStepService.java
 7 months ago
王杰 8cce62b47d Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
王杰 fbf1bfce20 装配件排序 7 months ago
王杰 441d28d2e1 Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
王杰 27086124ae 装配件工步调整 7 months ago
王杰 b32bef4d09 装配件整腔跳过ug 7 months ago
xiangwei.zhang 48f0360fb8 加工记录时间加毫秒，客退品和电子化检验查询串的问题修改 7 months ago
王杰 2d8901489d Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
王杰 8cafc24d35 装配件整腔跳过 7 months ago
王杰 d4102a5fcf Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
王杰 5f604adc9d 显示前道所有装配件 7 months ago
gsz f3b4e08a10 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 7 months ago
gsz 4a72b849e9 JIS拉动组规则校验 7 months ago
jun b741c1deb5 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 7 months ago
jun 1a4c94f88a getById方法增加organizeCode条件 7 months ago
王杰 c419399787 Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
王杰 860b4d9c49 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 7 months ago
王杰 53ba608c16 打印 7 months ago
yxw 265f4ef7dc 排序展示组件 展示工单序号 7 months ago
王杰 ab8cb55e4a Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
王杰 84436a5b0f 修复产品加工记录 数据覆盖 没有新增的问题 7 months ago
王杰 fdf8c283e8 设备日志明细分表 7 months ago
jun c0feb1dde4 排序发运逻辑调整 7 months ago
臧学普 c45b5724f6 暂时注释掉webservice 7 months ago
xiangwei.zhang c301a99fd2 Merge remote-tracking branch 'origin/dev' into dev 7 months ago
xiangwei.zhang 9a20923aa9 判断可疑 7 months ago
王杰 fa064ebd7d 打印策略 零件条码编码规则 字段用错 7 months ago
gsz 01dac4fe8c 初始化料筒修改 7 months ago
臧学普 f3e2254e45 电测试开发 7 months ago
臧学普 14817b8d61 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesCustomerSnTransformService.java
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnAndOrderStrategyServiceImpl.java
 7 months ago
王杰 0bdce60c37 Merge branch 'master' into dev-wuhan-temp 7 months ago
王杰 2ef09dee56 mes_equipment_log mes_work_cell_scan_monitor_log 分表动态sql ； 支持云工厂分表 7 months ago
gsz 630ac61e31 SPS打印增加打印时间 7 months ago
xiangwei.zhang c82eb99317 判断可疑 7 months ago
jun 94c320d2cb 排序发运逻辑调整 7 months ago
yxw 31072fac39 排序展示组件报错 7 months ago
臧学普 ad2a7f8722 电测试开发 7 months ago
yxw 8252c90f03 裁片原材料防错 7 months ago
jun 09b9c21a47 发运明细顺序校验逻辑调整 7 months ago
jun 082e83a94a 排序发运逻辑调整 7 months ago
jun 1ae36b99e2 发运数据double 7 months ago
jun d035447f29 报工增加bom总行数字段 7 months ago
王杰 838d1f82db merge dev 冲突解决 7 months ago
王杰 8930187f6f 代码优化 7 months ago
王杰 23b774af3a 工单修改工步 修改方式变更 7 months ago
王杰 893f307284 工单修改工步， 修改方式调整 7 months ago
jun 4d9d03725b Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 7 months ago
jun 24d2cd89e6 非排序报工功能开发（代码调整） 7 months ago
jun d708e96d46 非排序报工功能开发 7 months ago
xiangwei.zhang 7343c0e462 判断可疑 7 months ago
王杰 80677847b1 Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
王杰 3a81d887a5 前道防错工步 7 months ago
gsz 3b955236e6 43302 加料防错扫码流程优化 7 months ago
王杰 1a734d52d0 Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
王杰 315009b22c 合并dev 7 months ago
王杰 0f88c13f3b Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
王杰 e20e160034 合并dev 7 months ago
王杰 24fd34c088 合并dev 7 months ago
王杰 3b3edc9b46 条码修改工步 update 改成updateByProperties 7 months ago
jun 80c6aaf1f5 发运工单表中条码字段修改 7 months ago
王杰 4922e1bd58 Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
王杰 aa719fb463 通用客户条码转换逻辑变更 7 months ago
王杰 b4e500dd6d 合并 dev-wuhan master(工位扫描监控日志去除分表配置,直接使用动态sql写入生产线对应的分表) 7 months ago
王杰 1c2c03dccb Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
王杰 cfed01aa5c 工位扫描 日志 去除分表 写DB改成sql执行 8 months ago
王杰 36ee2c007a 临时存储 8 months ago
王杰 797904c87a Merge branch 'dev' 8 months ago
yxw 1cf4524daf 客户条码打印 8 months ago
王杰 78fb82c88a 规则并截取右侧流水装配件规则, 生成零件条码工步需要使用此流水生成新的零件条码 8 months ago
yxw a536b82cfd 排序产线客户条码打印 8 months ago
王杰 b8cf5c7cfe byd 装配件策略 截取右侧流水 8 months ago
yxw f82c6626a1 装配目视单打印策略类字段引用修改 8 months ago
yxw f930bb092b Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw 5eaf01b076 排序展示组件查询逻辑优化 8 months ago
gsz 44f72a56a6 PCN发运单打印页面1 8 months ago
gsz ad5934cfd8 43289 SPS拉动提示系统异常 8 months ago
xiangwei.zhang a05cd762bc 条码打印次数更新 8 months ago
王杰 d379ad543e Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
王杰 4092793204 排序流程 盲写代码 自测 问题修复 8 months ago
jun 4440d368a0 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
jun c9d4d0fa2f 排序汇报job开发 8 months ago
王杰 b3cdc996ed Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
王杰 7176608355 排序 加工记录 根据工单装配件写加工记录的汇报方式状态汇报零件号 8 months ago
jun 92845822c7 打印模板开发 8 months ago
xiangwei.zhang f9415668a3 判断可疑 8 months ago
王杰 70adc2f3a9 条码生成 对象增加 生产线 工位 8 months ago
王杰 2b362500b1 条码生成 对象增加 生产线 工位 8 months ago
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