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

1287 Commits (bc8533f0c8905f9fc1a1a2ec648fcd0217cee205)

Author SHA1 Message Date
jun 5c758f33c0 生产过程控制，标黄的是跳号的工单，而不是有跳过的工单。 9 months ago
jun 31de710227 客户条码补打 9 months ago
王杰 5bfb403b48 Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
王杰 e92c29a07a 装配件扫描 置顶 9 months ago
臧学普 b8ec695def 电测试 9 months ago
臧学普 2ab2ecdb80 电测试 9 months ago
jun e6aa6deb48 流程包含解绑工步[工步参数]逻辑优化 9 months ago
jun 8419842a17 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan-temp 9 months ago
jun e67dd0fe8d Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
jun e531d140ae CBR,排序报工逻辑调整 9 months ago
王杰 34e0e40256 Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
王杰 c7a5f904a0 代码优化 9 months ago
王杰 b118f22767 Merge branch 'master' into dev-wuhan-temp 9 months ago
王杰 5ab9d9098b 工艺参数完成 动态sql写入 9 months ago
gsz 8cb8b90b15 SPS拉动不校验强过顺序的 9 months ago
王杰 5bd431ac55 装配件显示 列增加配置 9 months ago
jun 7a4df0d184 排序发运逻辑调整 9 months ago
jun 254687ff81 第一次记录加工记录，同步标识应该为2 9 months ago
臧学普 e8b651168f Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
臧学普 1ebb40569f 电测试 9 months ago
gsz 8d832557c4 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 9 months ago
gsz 84e6e65172 SPS单据打印插入PrintedSnLog表 9 months ago
jun be37923e97 排序报工演示问题修复 9 months ago
xiangwei.zhang f30dea31ba 合并广州代码 9 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
 9 months ago
王杰 8cce62b47d Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
王杰 fbf1bfce20 装配件排序 9 months ago
王杰 441d28d2e1 Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
王杰 27086124ae 装配件工步调整 9 months ago
王杰 b32bef4d09 装配件整腔跳过ug 9 months ago
xiangwei.zhang 48f0360fb8 加工记录时间加毫秒，客退品和电子化检验查询串的问题修改 9 months ago
王杰 2d8901489d Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
王杰 8cafc24d35 装配件整腔跳过 9 months ago
王杰 d4102a5fcf Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
王杰 5f604adc9d 显示前道所有装配件 9 months ago
gsz f3b4e08a10 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 9 months ago
gsz 4a72b849e9 JIS拉动组规则校验 9 months ago
jun b741c1deb5 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
jun 1a4c94f88a getById方法增加organizeCode条件 9 months ago
王杰 c419399787 Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
王杰 860b4d9c49 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 9 months ago
王杰 53ba608c16 打印 9 months ago
yxw 265f4ef7dc 排序展示组件 展示工单序号 9 months ago
王杰 ab8cb55e4a Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
王杰 84436a5b0f 修复产品加工记录 数据覆盖 没有新增的问题 9 months ago
王杰 fdf8c283e8 设备日志明细分表 9 months ago
jun c0feb1dde4 排序发运逻辑调整 9 months ago
臧学普 c45b5724f6 暂时注释掉webservice 9 months ago
xiangwei.zhang c301a99fd2 Merge remote-tracking branch 'origin/dev' into dev 9 months ago
xiangwei.zhang 9a20923aa9 判断可疑 9 months ago
王杰 fa064ebd7d 打印策略 零件条码编码规则 字段用错 9 months ago
gsz 01dac4fe8c 初始化料筒修改 9 months ago
臧学普 f3e2254e45 电测试开发 9 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
 9 months ago
王杰 0bdce60c37 Merge branch 'master' into dev-wuhan-temp 9 months ago
王杰 2ef09dee56 mes_equipment_log mes_work_cell_scan_monitor_log 分表动态sql ； 支持云工厂分表 9 months ago
gsz 630ac61e31 SPS打印增加打印时间 9 months ago
xiangwei.zhang c82eb99317 判断可疑 9 months ago
jun 94c320d2cb 排序发运逻辑调整 9 months ago
yxw 31072fac39 排序展示组件报错 9 months ago
臧学普 ad2a7f8722 电测试开发 9 months ago
yxw 8252c90f03 裁片原材料防错 9 months ago
jun 09b9c21a47 发运明细顺序校验逻辑调整 9 months ago
jun 082e83a94a 排序发运逻辑调整 9 months ago
jun 1ae36b99e2 发运数据double 9 months ago
jun d035447f29 报工增加bom总行数字段 9 months ago
王杰 838d1f82db merge dev 冲突解决 9 months ago
王杰 8930187f6f 代码优化 9 months ago
王杰 23b774af3a 工单修改工步 修改方式变更 9 months ago
王杰 893f307284 工单修改工步， 修改方式调整 9 months ago
jun 4d9d03725b Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
jun 24d2cd89e6 非排序报工功能开发（代码调整） 9 months ago
jun d708e96d46 非排序报工功能开发 9 months ago
xiangwei.zhang 7343c0e462 判断可疑 9 months ago
王杰 80677847b1 Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
王杰 3a81d887a5 前道防错工步 9 months ago
gsz 3b955236e6 43302 加料防错扫码流程优化 9 months ago
王杰 1a734d52d0 Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
王杰 315009b22c 合并dev 9 months ago
王杰 0f88c13f3b Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
王杰 e20e160034 合并dev 9 months ago
王杰 24fd34c088 合并dev 9 months ago
王杰 3b3edc9b46 条码修改工步 update 改成updateByProperties 9 months ago
jun 80c6aaf1f5 发运工单表中条码字段修改 9 months ago
王杰 4922e1bd58 Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
王杰 aa719fb463 通用客户条码转换逻辑变更 9 months ago
王杰 b4e500dd6d 合并 dev-wuhan master(工位扫描监控日志去除分表配置,直接使用动态sql写入生产线对应的分表) 9 months ago
王杰 1c2c03dccb Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
王杰 cfed01aa5c 工位扫描 日志 去除分表 写DB改成sql执行 10 months ago
王杰 36ee2c007a 临时存储 10 months ago
王杰 797904c87a Merge branch 'dev' 10 months ago
yxw 1cf4524daf 客户条码打印 10 months ago
王杰 78fb82c88a 规则并截取右侧流水装配件规则, 生成零件条码工步需要使用此流水生成新的零件条码 10 months ago
yxw a536b82cfd 排序产线客户条码打印 10 months ago
王杰 b8cf5c7cfe byd 装配件策略 截取右侧流水 10 months ago
yxw f82c6626a1 装配目视单打印策略类字段引用修改 10 months ago
yxw f930bb092b Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw 5eaf01b076 排序展示组件查询逻辑优化 10 months ago
gsz 44f72a56a6 PCN发运单打印页面1 10 months ago
gsz ad5934cfd8 43289 SPS拉动提示系统异常 10 months ago