puxiao.liao
/
i3plus-mes-pcn-yfai
forked from I3-YF/i3plus-mes-pcn-yfai
1
0
Fork 0
Code Pull Requests Activity
2,183 Commits
142 Branches
39 Tags
16 MiB
mes-uat-changshu0609
mes-test
spotbugs-0630
mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht
mes-uat-changshu0609-temp-wj-250616-xisu
uat-temp-nht-2506120000-jialiao
mes-dev
dev_temp_xw_202505150000_46824
mes-uat-temp-logic-20250609-47191
dev_temp_xw_20250624_ncdev
mes-uat-changshu0609-temp-logic-20250613-3533
uat_temp_xw_2050619_nc
uat-temp-nht-2506190000-47758
uat-temp-nht-2506050000-spotbugs
uat-temp-nht-2506120000-47592
dev_temp_xw_20250610_46906
uat-temp-nht-2506120000-dataMatrix
dev_temp_xw_202506090000_47023
uat-temp-nht-2506050000-47389
mes-test-temp-DM202504230012
mes-test-merge-daxiaoxie
mes-uat
mes-uat-temp-logic-20250529-47241
dev_temp_xw_202505230000_47023
mes-uat-temp-logic-20250526-47187
uat-temp-nht-2505260000-47177
uat-temp-nht-2505230000-47122
mes-test-batch-report-bug
uat-temp-nht-2505210000-chengdu-custpart
mes-uat-temp-47040
uat-temp-nht-2505200000-47042
yfai-20250418-dev
uat-temp-nht-2505160000-46987
uat-temp-wj-chongqingdaqu-prod-temp-logic-20250517-46981
uat-temp-wj-chongqingdaqu-prod-temp-reportproductionversion
uat-temp-wj-chongqingdaqu-prod-temp-publish0415-bak
mes-master
dev_temp_xw_202505150000_46970
uat-temp-nht-202505150000-46881
uat-temp-wj-chongqingdaqu-prod
dev_temp_xw_202505150000_46950
uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd2
uat-temp-wj-chongqingdaqu-prod-temp-publish0415
uat-temp-nht-2504270000-46499
uat-temp-wj-chongqingdaqu-prod-huaweiyun
uat-temp-nht202505120000-46757
uat-temp-nht-202505090001-46746
uat-temp-wj-chongqingdaqu-prod-huaweiyun-46428
dev_temp_xw_202505120000_46850
uat-temp-wj-chongqingdaqu-prod-temp-logic-20250508-46601
uat-temp-wj-chongqingdaqu-prod-lijiabatchreport
uat-temp-nht-2504300000-46708
uat-temp-nht-2505060001-46742
uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd
uat-temp-nht-2505060000-shippingScanSn
uat-temp-nht-2505020000-shippingkanban
uat-temp-wj-chongqingdaqu-prod-huaweiyun-temp
uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-lijia
uat-temp-wj-chongqingdaqu-prod-huaweiyun-ps-save
uat-temp-wj-chongqingdaqu-prod-huaweiyun-46615
uat-temp-wj-chongqingdaqu-prod-huaweiyun-shipping-repeat-bug
uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-lijia-cd
uat-temp-nht-2504240000-data-matrix
uat-temp-wj-chongqingdaqu-prod-temp-46319
uat-temp-wj-chongqingdaqu-prod-temp-46503
uat-temp-nht-2504140000-46317
uat-temp-nht-chengdu-publish
dev_temp_xw_202504210000_46466
uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-merge-cd
uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping
uat-temp-wj-chongqingdaqu-prod-merge-longxing
dev_temp_xw_202504170000_45858
uat-temp-wj-chongqingdaqu-prod-temp-control-order-qty
dev_temp_xw_202504180000_46348
uat-temp
uat
uat-temp-wj-chongqingdaqu-prod-temp-merge-all
uat-temp-wj-chongqingdaqu-prod-temp-denglizi
uat-temp-wj-chongqingdaqu-prod-temp-46420
dev_temp_xw_202503260000_45858
uat-temp-wj-chongqingdaqu-dev
dev_temp_xw_202504160000_45524
uat-temp-nht-2503250001-twoshippingcheck
uat-temp-nht-2504070000-46139
uat-temp-wj-chongqingdaqu-prod-temp-merge
uat-temp-nht-2504100000-46214
uat-temp-nht-2504090000-46216
uat-temp-nht-2503130000-chengdu-shipping
uat-temp-wj-chongqingdaqu-prod-temp-logic-20250410-46141
dev_temp_xw_202504100000_46256
dev_temp_xw_202504090000_46196
uat-temp-nht-2504020000-3520
uat-temp-wj-chongqingdaqu-prod-temp-rfid
uat-temp-wj-chongqingdaqu-prod-chengdu
uat-temp-nht-2504040000-lx
uat-temp-wj-chongqingdaqu-prod-temp-pingxinggongwei
uat-temp-wj-45787
uat-temp-nht-2503200000-volvo-print
uat-temp-wj-chongqingdaqu-dev-craft-check
dev
dev_temp_xw_202503310000_45843
dev_temp_xw_202503280000_45843
uat-temp-wj-chongqingdaqu-dev-equcontext
uat-temp-wj-chongqingdaqu-dev-temp-logic-20250328-seresReport
uat-temp-nht-2503280000-cdpartsprint
uat-dev
test
uat-temp-wj-chongqingdaqu-dev-bak
uat-temp-wj-chongqingdaqu-dev-temp-logic-20250325-45822
uat-temp-wj-chongqingdaqu-dev-temp-logic-20250321-45820
uat-temp-nht-2503220000-45859
uat-temp-wj-2502060000-chongqing-step
uat-temp-ljx-chongqi-dev-20250318
uat-temp-wj-chongqingdaqu-dev-temp-logic-20250313-45623
uat-temp-nht-25027-chengdu
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
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
uat-temp-nht-250226-lijia
uat-temp-wj-lijia-prod
uat-temp-nht-202502180000-shippingkanban
test-temp-wj-45329
uat-temp-nht-202502260000-customprint
uat-temp-wj-longxin-prod
dev-temp-nht-202502180000-customprint
uat-temp-nht-2502200000-lijia-sn-print
dev-temp-xw-202502170000-111111
uat_temp_castle_250213_44248
uat-temp-castle-250211-44248
uat-temp-wj-250208-manycellbug
uat-temp-nht-2502060000-44953
uat-temp-wj-250124-equ-check-step
test-temp-wj-250117-pack
master
yfai-pcn-ext-v4.2
yfai-pcn-ext-v4.1
yfai-pcn-ext-v4.0
yfai-pcn-ext-v3.9
yfai-pcn-ext-v3.8
yfai-pcn-ext-v3.7
yfai-pcn-ext-v3.6
yfai-pcn-ext-v3.55
yfai-pcn-ext-v3.5
yfai-pcn-ext-v3.45
yfai-pcn-ext-v3.4
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 '1f2bf0a276'
${ noResults }
Commit Graph

558 Commits (1f2bf0a276969bf65fbcd2af3b2694fec08330d8)

Author SHA1 Message Date
王杰 4b9beb099d Merge branch 'uat-temp-wj-2412280000-44630' into test 10 months ago
王杰 03029876b6 44653 电子化检验输入数量支持小数点输入 10 months ago
王杰 75ef282bcf 44423 返工作业页面增加排序拆解按钮 merge 解决冲突 10 months ago
王杰 7462388c13 44630 读胎膜信号工步，无法适配柔性焊流程，需要优化 10 months ago
王杰 6e83356ec4 排序拆解 10 months ago
王杰 379aad9ba4 bom 查询条件 增加配置 11 months ago
王杰 644a60aacf merge dev-temp-wj-2412180000-00000 :pda产品加工记录查询报表修改 解决冲突 11 months ago
王杰 dd3dddd97f 产品加工记录 查询 报表 页面数据展示优化 (增加当前条码的最新状态工位质量等信息, 修复加工记录列表零件状态空的问题) 11 months ago
王杰 5e4175614d 解决冲突 11 months ago
王杰 3a1ddfe318 武汉油漆线批量打印 11 months ago
王杰 323c326f2e Merge branch 'dev-temp-wj-2024130000-00000' into dev 11 months ago
王杰 e14d752618 零件条码统计工步; 保存激光装配件工步 11 months ago
王杰 cbca3e6e73 解决冲突 11 months ago
王杰 420f043fd1 PDA上允许用户删除点检单，并且同步到WEB端 11 months ago
王杰 47cc8d6261 44263 PCN装箱防错：满箱关箱后，提示“当前箱条码已完成装箱。请扫描下一个箱条码” 11 months ago
jun 0850df7369 武汉cockpit发运防错按照散件方式写入 11 months ago
jun c8ef2c8044 fix #bug 44007 排序发运增加客户订单号写入到mes_jis_shipping字段：按照广州工厂装车单字段写入。 11 months ago
王杰 9134ed28aa 拉动单打印 增加 LOCK 11 months ago
jun 1c7193c555 装箱防错记录用户上次操作是否记忆 11 months ago
王杰 16d03491d3 打印 增加零件条码参数属性；离线部分代码提交；选择工单按钮 开始结束查询条件默认值接口返回; 11 months ago
jun 996af9cf85 设备点检功能变更开发 12 months ago
castle.zang 5df4a7dc80 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 12 months ago
castle.zang 25358f36df 打印目视单-description 12 months ago
王杰 490ca9a003 排序装配件 逻辑调整 12 months ago
王杰 1c3e2656d8 排序 跳过 12 months ago
王杰 872f8e9413 去除离线生产配置 12 months ago
王杰 4305ea53ab Merge branch 'dev-wuhan-temp' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan-temp 12 months ago
jun 2d58f43022 发运扫描提示信息 12 months ago
王杰 a237d0672e 可复用 逻辑重写 12 months ago
王杰 15f8d56864 离线同步JOB 1 year ago
jun 393461a03e Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 1 year ago
jun 1d12047d10 通用导出报表开发 1 year ago
王杰 d693da28c8 扫描产成零件工步 1 year ago
王杰 0c7016e070 点位表 接口逻辑表 修改时间 没有值 导致程序报错 问题修复 1 year ago
castle.zang 99ab2c2d85 重构sps代码 1 year ago
castle.zang 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
 1 year ago
castle.zang 08b0b58982 重构sps代码 1 year ago
王杰 bc8533f0c8 装配件 唯一性 验证 增加 模内验证 1 year ago
jun 827ba97c7b 应急件库位管理演示问题修复 1 year ago
jun c6bc7781b2 SPS 生成webservice从MES换到PCN 1 year ago
王杰 cddd64250b 装配件 匹配后 前端列表滚动条自动定位 1 year ago
王杰 7767805389 离线版本 1 year ago
jun 5830b0452b 非排序产线打印客户条码信息 1 year ago
jun be81832476 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 1 year ago
jun 2579987543 等离子工步写入数据耗时较长 1 year ago
王杰 bd72537b82 工单 生产顺序号 字段 pojo 属性名变更 数据库字段不变 1 year ago
王杰 25cabf46bb 生产工单 重复的 生产时间字段 上下线时时间 临时写值 后续统一改 1 year ago
王杰 5c3fcc53d2 生产工单 重复的 生产时间字段 上下线时时间 临时写值 后续统一改 1 year ago
王杰 b170bd66f2 代码优化 1 year ago
王杰 e1c3021899 代码优化 1 year ago
王杰 7993912d8b merge dev-wuhan 1 year ago
王杰 b7b4ecb676 merge dev 1 year ago
王杰 5af8d8faf8 Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
jun 172047542c Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 1 year ago
jun 176fb4505f 应急件库位管理开发 1 year ago
王杰 0d1769c17c 排序 装配件 前置写库 1 year ago
王杰 5b773eb9b5 排序 装配件 实时落库 1 year ago
jun 0fe1ca2ebf JIS拉动，要加跳过码，标记是跳过的 1 year ago
jun d709c834d5 Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
jun 428a3d8884 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 1 year ago
jun 31de710227 客户条码补打 1 year ago
王杰 5bfb403b48 Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
王杰 e92c29a07a 装配件扫描 置顶 1 year ago
jun e6aa6deb48 流程包含解绑工步[工步参数]逻辑优化 1 year ago
王杰 34e0e40256 Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
王杰 b118f22767 Merge branch 'master' into dev-wuhan-temp 1 year ago
王杰 5ab9d9098b 工艺参数完成 动态sql写入 1 year ago
王杰 5bd431ac55 装配件显示 列增加配置 1 year ago
jun 254687ff81 第一次记录加工记录，同步标识应该为2 1 year ago
王杰 441d28d2e1 Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
王杰 27086124ae 装配件工步调整 1 year ago
王杰 d4102a5fcf Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
王杰 5f604adc9d 显示前道所有装配件 1 year ago
王杰 c419399787 Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
yxw 265f4ef7dc 排序展示组件 展示工单序号 1 year ago
王杰 ab8cb55e4a Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
王杰 84436a5b0f 修复产品加工记录 数据覆盖 没有新增的问题 1 year ago
王杰 fdf8c283e8 设备日志明细分表 1 year ago
王杰 838d1f82db merge dev 冲突解决 1 year ago
王杰 1a734d52d0 Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
王杰 315009b22c 合并dev 1 year ago
王杰 b4e500dd6d 合并 dev-wuhan master(工位扫描监控日志去除分表配置,直接使用动态sql写入生产线对应的分表) 1 year ago
王杰 1c2c03dccb Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
王杰 cfed01aa5c 工位扫描 日志 去除分表 写DB改成sql执行 1 year ago
yxw 1cf4524daf 客户条码打印 1 year ago
yxw a536b82cfd 排序产线客户条码打印 1 year ago
王杰 b8cf5c7cfe byd 装配件策略 截取右侧流水 1 year ago
王杰 d379ad543e Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
王杰 4092793204 排序流程 盲写代码 自测 问题修复 1 year ago
jun c9d4d0fa2f 排序汇报job开发 1 year ago
王杰 b3cdc996ed Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
jun 92845822c7 打印模板开发 1 year ago
王杰 9b685988ed Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
yxw bd4d547f4b 保存裁片工单结果工步-裁片工单号获取方式修改 1 year ago
王杰 df5757bec8 排序 保存加工结果 1 year ago
yxw d1b5e32076 非排序产出零件条码 去掉cutWorkOrderNo 字段 1 year ago
yxw bdceeb26f5 排序展示组件开发 1 year ago
王杰 5e2d89d6af Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
王杰 c5ef060b85 Merge branch 'dev' 1 year ago
王杰 4e94622cfd Merge branch 'dev' into dev-wuhan 1 year ago
王杰 c39b5a9ab1 排序 保存工单装配件 1 year ago
yxw 30082cc4ae 裁片工步修改： 
1、加工规则匹配时，对进料条件封装foreignKey
2、保存裁片条码工步取消引用保存条码工步，改为在本工步实现根据是否存在进料条码保存条码逻辑
3、裁片工单号存值改为产出零件上下文中
 1 year ago
yxw 16ee98410f 装配目视单打印 1 year ago
yxw 6efdf95220 装配目视单打印 1 year ago
王杰 413f68de13 保存加工结果 排序 1 year ago
jun b026ee071c Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 1 year ago
jun fc3e0bab38 排序发运功能开发 1 year ago
yxw ffbc8c888d Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
yxw 8ed36a5e6b Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 1 year ago
yxw a9e45c3a00 装配目视单打印 1 year ago
gsz 361eb7e455 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 1 year ago
gsz 0aafab31c8 排序电子化检验支持加工单扫描或者加工单客户条码1 1 year ago
xiangwei.zhang c210f5e8b2 判断可疑 1 year ago
王杰 98843e2581 Merge branch 'master' into dev-wuhan-temp 1 year ago
王杰 c403807421 Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
王杰 40f8d63189 设备点检 1 year ago
yxw aad6e2dd48 装配目视单打印 1 year ago
yxw 91f6148ac7 新增打印工单打印队列 1 year ago
王杰 857f7c4fc2 Merge branch 'master' into dev-wuhan-temp 1 year ago
王杰 3215c2957e 漏信号 改LOG状态增加修改时间条件 1 year ago
王杰 70cca89c41 Merge branch 'master' into dev-wuhan-temp 1 year ago
王杰 8c5c959c3a 漏信号 bug 1 year ago
王杰 4e2056d1fa Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
王杰 7f7c46d92e 显示装配件 json to string 序列号 null 异常处理 1 year ago
王杰 0c1bfef981 Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
yxw def629d6a2 排序产线工单发布新增装配目视单打印队列 1 year ago
王杰 825891b51a 漏信号 代码 报错 问题修复 查询id bigint 转long 1 year ago
王杰 1a05d6deb5 Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
王杰 05038cf65c 排序 匹配装配件工步 1 year ago
jun 63493c7fd9 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 1 year ago
jun 9ceb874f19 通用包装组零件校验(VKM)功能开发 1 year ago
王杰 e22a91f580 排序 匹配工步 1 year ago
王杰 8e81257831 排序 匹配装配件工步 1 year ago
yxw ca1aa4a652 裁片工单打印优化 1 year ago
王杰 ba1a743d20 Merge branch 'master' into dev-wuhan-temp 1 year ago
yxw 3c60fd4487 PCN裁片工单打印 1 year ago
王杰 8f3dd7bc9b 排序 显示前道所有装配件扫描项 1 year ago
yxw 312a57c4be 裁片工单标签打印接口开发 1 year ago
yxw cab28f1ba8 裁片箱标签打印参数增加时间 1 year ago
yxw 6e90772d0f 裁片箱条码打印 1 year 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
 1 year ago
yxw a6a399205d 裁片箱条码打印 1 year ago
yxw 226ee0be3f 裁片方案、工单增加属性 1 year ago
jun b387f9c11e 增加常量3定义 1 year 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
 1 year ago
jun e931661d01 包装解绑功能开发 1 year ago
yxw 5ea796fb79 裁片打印工步 1 year ago
王杰 984a761881 前道防错， 顺序防错 逻辑调整 1 year ago
王杰 da07938e34 扫描主条码 工步 剔除排序场景 1 year ago
王杰 d51bcd2278 排序 显示装配件扫描项 1 year ago