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

432 Commits (7c42d157879a742f75d689db4e0d946bcde97c65)

Author SHA1 Message Date
王杰 1f6fe5e4a0 零件打包 6 months ago
王杰 51ba9f967f Merge remote-tracking branch 'origin/uat-temp-castle-2501090929-44791' into test 6 months ago
王杰 14939ea2e5 Merge branch 'uat-temp-wj-2501090000-44517' into test 6 months ago
王杰 47e87b8fe1 44517 装箱防错后吐条码需求（芜湖） 6 months ago
臧学普 eee50bfcdf 44791 迁移线末大屏看板到 pcn 6 months ago
王杰 1edc7329f6 Merge branch 'uat-temp-wj-2412270000-44514' into uat 7 months ago
王杰 b89c6e4775 Merge branch 'uat-temp-wj-2412280000-44630' into uat 7 months ago
王杰 1d4ac69a53 44509 需要边端开发和零件条码状态相关的报表，用来展示未知条码 merge uat-temp-castle-2412301006-44509 解决冲突 7 months ago
王杰 8501f466ea Merge branch 'uat-temp-castle-2412301037-44520&44635' into test 7 months ago
王杰 8e519ae585 Merge branch 'uat-temp-wj-2412270000-44514' into test 7 months ago
王杰 4b9beb099d Merge branch 'uat-temp-wj-2412280000-44630' into test 7 months ago
臧学普 86f9128348 44509 查询条码状态 7 months ago
臧学普 e992c4de6d 44635 芜湖排序发运打印 7 months ago
臧学普 b910521dc7 44509 pcn端条码报表 7 months ago
王杰 4fda271266 Merge branch 'uat-temp-castle-2412250942-44253' into test 7 months ago
王杰 75ef282bcf 44423 返工作业页面增加排序拆解按钮 merge 解决冲突 7 months ago
王杰 559e87f8b4 Merge branch 'dev-temp-castle-2412191916-44449' into test 7 months ago
王杰 7462388c13 44630 读胎膜信号工步，无法适配柔性焊流程，需要优化 7 months ago
王杰 fe5275dcce 44514 料包绑定条码列显示全，扫描的条码需要增加定位 (修改提示信息) 7 months ago
臧学普 b335bdd105 修复bug 44253 同Pisces，零件发运组/发运组明细可以实现“前道工艺”校验 7 months ago
王杰 6e83356ec4 排序拆解 7 months ago
臧学普 03f6e6fbce 新增Leo接口，通过报工条码查询零件号 7 months ago
王杰 f95fbce203 Merge branch 'dev-temp-caslte-241218-44247' into dev-temp-workorder-report 7 months ago
王杰 379aad9ba4 bom 查询条件 增加配置 7 months ago
臧学普 c3324d4736 fix bug 44247 装箱防错分外协件和自制件，自制件的情况下可以不用维护扫描规则 7 months ago
王杰 0994ffd413 Merge branch 'dev-temp-wj-2412180000-44399' into dev 7 months ago
王杰 103f2dcd07 44399 工位表的工位图的file_ID取 mes_media_file_cfg表的ID 7 months ago
王杰 644a60aacf merge dev-temp-wj-2412180000-00000 :pda产品加工记录查询报表修改 解决冲突 7 months ago
王杰 dd3dddd97f 产品加工记录 查询 报表 页面数据展示优化 (增加当前条码的最新状态工位质量等信息, 修复加工记录列表零件状态空的问题) 7 months ago
王杰 49716d9adb Merge branch 'dev-temp-wj-2024150000-00000' into dev 7 months ago
王杰 56efc17296 1. 生产过程控制 工步正确提示音(匹配成功加工规则/匹配成功装配件);2.生产过程控制 工步删除部分提示信息(扫描/读装配件/匹配装配件/保存装配件 精简提示信息);3.生产过程控制 工步保存加工数/显示加工数/清除加工数 逻辑调整 (工位图跟加工数同时维护时, 优先展示工位图, 并且仍统计加工数(原逻辑:加工数优先展示));4.生产过程控制 工步非排序打印, 不打印时不再发送空打印信息给客户端, 同时不再变更条码的打印状态, 并不再提示打印成功;5.生产过程控制 工步排序打印, 查询工单 查询方式 调整, 不使用in查询;6.生产过程控制 展示组件信息发送逻辑变更: 排序/非排序 工单信息/班次班组/工位图(加工数)/队列表格 改为一次性发送到客户端 7 months ago
王杰 cbca3e6e73 解决冲突 7 months ago
王杰 bf87b62618 Merge branch 'dev-temp-wj-2412120000-44263' into dev 7 months ago
王杰 420f043fd1 PDA上允许用户删除点检单，并且同步到WEB端 7 months ago
王杰 47cc8d6261 44263 PCN装箱防错：满箱关箱后，提示“当前箱条码已完成装箱。请扫描下一个箱条码” 7 months ago
王杰 1dedd5646a 44290 开关班管理，选完产线后自动退出到登录页面 7 months ago
jun 0850df7369 武汉cockpit发运防错按照散件方式写入 8 months ago
jun c8ef2c8044 fix #bug 44007 排序发运增加客户订单号写入到mes_jis_shipping字段：按照广州工厂装车单字段写入。 8 months ago
王杰 9134ed28aa 拉动单打印 增加 LOCK 8 months ago
王杰 7e15f04548 离线数据回传解析增加补偿逻辑 8 months ago
jun 8edddb1bc0 Merge remote-tracking branch 'origin/dev' into dev 8 months ago
jun a2a750489f 43927 装箱防错逻辑更新及优化 8 months ago
臧学普 6554e176f4 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 8 months ago
臧学普 fe3c342dee 离线客户条码打印 8 months ago
王杰 6e2ce20b3b 展示组件 初始化 时禁用扫描框 ； 排序工单 及条码 的上线时间赋值 扫描工单的时间 8 months ago
王杰 16d03491d3 打印 增加零件条码参数属性；离线部分代码提交；选择工单按钮 开始结束查询条件默认值接口返回; 8 months ago
jun f079ee5f03 生产过程控制查询工单增加时间查询条件 8 months ago
jun ac90d30220 设备点检最新方案调整 8 months ago
jun 51567a7b7f 广州发运慢问题修复 8 months ago
王杰 1c3e2656d8 排序 跳过 8 months ago
王杰 bb78d98afc 注释代码 8 months ago
王杰 872f8e9413 去除离线生产配置 8 months ago
jun a92e9ab627 打印模板事务问题修复 8 months ago
王杰 a237d0672e 可复用 逻辑重写 9 months ago
臧学普 a319b05ce9 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 9 months ago
王杰 1e146c8596 裁片工单工步 修改 9 months ago
臧学普 a0e27add57 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 9 months ago
王杰 15f8d56864 离线同步JOB 9 months ago
臧学普 3d77e70d79 离线检查是否拉数据 9 months ago
jun 3b3e8014b5 武汉汇报job&装配目视单打印问题修复 9 months ago
jun 61c351f458 芜湖发运增加唯一性校验 9 months ago
王杰 d693da28c8 扫描产成零件工步 9 months ago
王杰 96c55eaad5 排序装配件 保存 记录 bug 修复 9 months ago
臧学普 12ca42f386 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 9 months ago
jun 84361a3027 查询条件没加工厂代码排查 9 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
 9 months ago
臧学普 08b0b58982 重构sps代码 9 months ago
王杰 bc8533f0c8 装配件 唯一性 验证 增加 模内验证 9 months ago
jun 827ba97c7b 应急件库位管理演示问题修复 9 months ago
jun e2433f1a78 打印模板调整 9 months ago
jun b1f27d6e72 SPS 生成webservice从MES换到PCN 9 months ago
jun 18b4d11e9b CBR报工逻辑调整 9 months ago
王杰 bd72537b82 工单 生产顺序号 字段 pojo 属性名变更 数据库字段不变 9 months ago
王杰 5af8d8faf8 Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
jun 176fb4505f 应急件库位管理开发 9 months ago
jun d709c834d5 Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
臧学普 54caad459e Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 9 months ago
臧学普 409c979c0e 优化电测试 9 months ago
jun 428a3d8884 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
jun 31de710227 客户条码补打 9 months ago
王杰 5bfb403b48 Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
王杰 e92c29a07a 装配件扫描 置顶 9 months ago
王杰 34e0e40256 Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
王杰 b118f22767 Merge branch 'master' into dev-wuhan-temp 9 months ago
臧学普 e8b651168f Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
臧学普 1ebb40569f 电测试 9 months ago
王杰 d4102a5fcf Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
王杰 5f604adc9d 显示前道所有装配件 9 months ago
王杰 ab8cb55e4a Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
王杰 fdf8c283e8 设备日志明细分表 9 months ago
臧学普 ad2a7f8722 电测试开发 9 months ago
王杰 1c2c03dccb Merge branch 'dev-wuhan' into dev-wuhan-temp 10 months ago
王杰 797904c87a Merge branch 'dev' 10 months ago
王杰 b8cf5c7cfe byd 装配件策略 截取右侧流水 10 months ago
gsz 44f72a56a6 PCN发运单打印页面1 10 months ago
王杰 d379ad543e Merge branch 'dev-wuhan' into dev-wuhan-temp 10 months ago
jun c9d4d0fa2f 排序汇报job开发 10 months ago
王杰 9b685988ed Merge branch 'dev-wuhan' into dev-wuhan-temp 10 months ago
王杰 1cb80d9451 merge dev pom冲突 10 months ago
王杰 947fa99b48 工位扫描 监控日志信息 设备代码判空补字段值 10 months ago