puxiao.liao
/
i3plus-mes-pcn-yfai
forked from I3-YF/i3plus-mes-pcn-yfai
1
0
Fork 0
Code Pull Requests Activity
2,193 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 '82f72e0bdd'
${ noResults }
Commit Graph

2153 Commits (82f72e0bdda260a3deddf2949b84010162d38e6f)

Author SHA1 Message Date
xiangwei.zhang 4e543f517f 44863 PCN-零件生产组增加“禁用Bom版本号”开关最终确认版逻辑优化 9 months ago
王杰 fcd7d440c5 包装补打印 9 months ago
王杰 dca4d89330 包装补打印 9 months ago
王杰 c59e47601d 包装补打印 9 months ago
王杰 712a6603d9 打包 9 months ago
王杰 5bfed2ca8e 打包 9 months ago
王杰 bc39704375 打包 9 months ago
王杰 32b9447a35 打包 9 months ago
王杰 17818f5ea2 打包 9 months ago
王杰 91fbdbed6a 打包 9 months ago
王杰 548ba84f08 44937 PCN：批量手动报工页面，排序方式按照工单号升序 9 months ago
王杰 bd4f18ed84 重庆打包 9 months ago
王杰 1f6fe5e4a0 零件打包 9 months ago
王杰 96f0278f47 Merge remote-tracking branch 'origin/uat-temp-xw-202501170000-44873' into uat 9 months ago
王杰 f241329b41 Merge remote-tracking branch 'origin/dev-temp-xw-202501160000-44858' into uat 9 months ago
王杰 e5cb750081 Merge remote-tracking branch 'origin/dev-temp-nht-202501150000-44584' into uat 9 months ago
王杰 7ea9817b27 打包 9 months ago
王杰 a7b4f79a5f Merge branch 'test-temp-wj-2501170000-00000' into test 9 months ago
王杰 6d4ed9fe69 44887 离线数据回传问题修复 9 months ago
王杰 5aacd09a61 打包 9 months ago
jun 6747c5f14b 44904 PCN-发运异常处理 9 months ago
王杰 2759a1c621 Merge remote-tracking branch 'origin/test-demp-ljs-202501081531-44896' into test 9 months ago
jun 15c86109d5 44896 生产汇报边端同步云端问题修复 10 months ago
王杰 6892759782 44435 PCN：排序下线条码打印配置follow Pisces 10 months ago
王杰 0c74c405de 重庆打包 10 months ago
xiangwei.zhang 2acd70ca6a 44873 PCN-批量报工页面，工单展示顺序基于工单序号正序排列显示 
44883 MES:PCN-批量报工，写入报工表中未写入bom_code
 10 months ago
王杰 5349353ca8 44887 离线数据回传问题修复 10 months ago
xiangwei.zhang db924c2dfa 44858 PCN:设备报废的数据在mes_part_inspection修改人为空，并且数据自动由可疑转正常，同时没有产生初判的移库 
44805 PCN：电子化检验选零件的页面增加单位
 10 months ago
Jason e1bc7f21a0 44744 修复同一条码完成返工后完成质检成功，后续无法再次操作电子化检验问题 10 months ago
王杰 51ba9f967f Merge remote-tracking branch 'origin/uat-temp-castle-2501090929-44791' into test 10 months ago
王杰 14939ea2e5 Merge branch 'uat-temp-wj-2501090000-44517' into test 10 months ago
王杰 712fb6b943 44517 装箱防错后吐条码需求（芜湖） 10 months ago
王杰 86a6b595fd 44517 装箱防错后吐条码需求（芜湖）临时保存提交 10 months ago
王杰 b695fc1742 44517 装箱防错后吐条码需求（芜湖）临时保存提交 10 months ago
Jason df7ac14ebe 44584 修复排序工单发运完成后，条码状态未更新为发运问题。 10 months ago
xiangwei.zhang b7020bb6f4 44838 MES:裁片补片逻辑更新＆裁片报表 10 months ago
王杰 3707bea56e Merge branch 'test-temp-wj-2501140000-44828' into test 10 months ago
王杰 f1f5a07862 Merge remote-tracking branch 'origin/dev-temp-xw-202501031636-44657' into test 10 months ago
王杰 a8ee0646d0 Merge branch 'uat-temp-wj-2412300000-44653' into test 10 months ago
王杰 315703f41d 44828 PCN: 装箱防错需要校验条码的状态 10 months ago
王杰 96900f5e7b 44517 装箱防错后吐条码需求（芜湖） 10 months ago
王杰 5e5e2b4de8 44517 装箱防错后吐条码需求（芜湖） 10 months ago
王杰 8daaa603bf 44517 装箱防错后吐条码需求（芜湖） 10 months ago
王杰 f9c6b5e81b 44517 装箱防错后吐条码需求（芜湖） 10 months ago
王杰 3bdc59534c 44517 装箱防错后吐条码需求（芜湖） 10 months ago
王杰 4a9dabfbf3 44517 装箱防错后吐条码需求（芜湖） 10 months ago
王杰 47e87b8fe1 44517 装箱防错后吐条码需求（芜湖） 10 months ago
castle.zang 8d8d54eafb 44791 迁移线末大屏看板到 pcn 10 months ago
xiangwei.zhang fd82011fab 该类改加工记录毫秒 回退版本 10 months ago
xiangwei.zhang f848b4bcbf Merge branch 'uat' into uat-temp-copydevorderservice 10 months ago
castle.zang eee50bfcdf 44791 迁移线末大屏看板到 pcn 10 months ago
xiangwei.zhang 057f5f0bb1 44729 PDA: 可疑转正常的条码，可以进行发运扫描。 10 months ago
xiangwei.zhang 7da60df921 Merge branch 'uat-temp-xw-2501030000-44701' into test 10 months ago
xiangwei.zhang 685431353d 44703 返工完成后，产生2笔不一样的事务 因合并代码问题修复 10 months ago
王杰 52ee8d84fa Merge branch 'uat-temp-wj-2501030000-44697' into test 10 months ago
王杰 78f658d183 44697 创建状态允许电子化检验 10 months ago
王杰 1edc7329f6 Merge branch 'uat-temp-wj-2412270000-44514' into uat 10 months ago
王杰 ffdf5491c4 Merge branch 'uat-temp-copydevorderservice' into uat 10 months ago
王杰 cd2fdd6026 Merge branch 'uat-temp-wj-2412310000-44666' into uat 10 months ago
王杰 93f6ee6188 Merge branch 'uat-temp-wj-2412300000-44631' into uat 10 months ago
王杰 f0a63f47fb Merge branch 'uat-temp-wj-2412270000-44586' into uat 10 months ago
王杰 b89c6e4775 Merge branch 'uat-temp-wj-2412280000-44630' into uat 10 months ago
王杰 1d4ac69a53 44509 需要边端开发和零件条码状态相关的报表，用来展示未知条码 merge uat-temp-castle-2412301006-44509 解决冲突 10 months ago
王杰 8501f466ea Merge branch 'uat-temp-castle-2412301037-44520&44635' into test 10 months ago
王杰 8e519ae585 Merge branch 'uat-temp-wj-2412270000-44514' into test 10 months ago
王杰 861ff14129 Merge branch 'uat-temp-copydevorderservice' into test 10 months ago
王杰 9f793bb1b8 Merge branch 'uat-temp-wj-2412310000-44673' into test 10 months ago
王杰 02043ac59f Merge branch 'uat-temp-wj-2412310000-44666' into test 10 months ago
王杰 8566676e9e Merge branch 'uat-temp-wj-2412300000-44631' into test 10 months ago
王杰 f1fa426dc5 Merge branch 'uat-temp-wj-2412270000-44586' into test 10 months ago
王杰 4b9beb099d Merge branch 'uat-temp-wj-2412280000-44630' into test 10 months ago
xiangwei.zhang f0ba25d59b 44657 报工前一天job 修改remark 10 months ago
王杰 8402aab2e1 44653 电子化检验输入数量支持小数点输入 10 months ago
王杰 e38af16025 44653 电子化检验输入数量支持小数点输入 10 months ago
王杰 ef4d9490c7 44631 生产过程控制D01CR01A产线，提示“系统异常” (第二次修改: 改工步枚举属性判断错误) 10 months ago
王杰 e01eaadf05 44666 PCN-CBR产成条码打印逻辑优化 10 months ago
xiangwei.zhang df366ba46b 44673 datasync同步与报工JOB同一秒执行同一条加工记录，导致云端为等待汇报，边端已经汇报完成 10 months ago
王杰 eb2878791f 44673 MES：datasync同步与报工JOB同一秒执行同一条加工记录，导致云端为等待汇报，边端已经汇报完成 10 months ago
王杰 144548665f 44666 PCN-CBR产成条码打印逻辑优化 10 months ago
王杰 03029876b6 44653 电子化检验输入数量支持小数点输入 10 months ago
castle.zang e59b940238 44509 查询条码状态-删除依赖的类 10 months ago
王杰 3f0a8b2d62 Merge branch 'uat-temp-wj-2412270000-44586' into uat-temp-wj-2412300000-44653 10 months ago
castle.zang c69884d16a 44509 查询条码状态 10 months ago
castle.zang 86f9128348 44509 查询条码状态 10 months ago
castle.zang e992c4de6d 44635 芜湖排序发运打印 10 months ago
xiangwei.zhang f71fb409d9 未完成数量计算错误-44633 10 months ago
王杰 66ec91c61a 44631 生产过程控制D01CR01A产线，提示“系统异常” 10 months ago
王杰 cc48d20729 44631 生产过程控制D01CR01A产线，提示“系统异常” 10 months ago
castle.zang b910521dc7 44509 pcn端条码报表 10 months ago
xiangwei.zhang 67c053c8bc 未完成数量计算错误 10 months ago
王杰 04f9abeb20 44632 零件发运组 明细不需要校验是否为空 10 months ago
王杰 e2fb2740c9 Merge branch 'uat-temp-wj-2412241000-44315-44425' into test 10 months ago
王杰 01f9898de2 44242 PCN:装箱防错，已经关箱的箱条码，如果重复扫描，不需要重置，可以扫描下一个需要装箱的条码 (uat-temp-castle-20241224-44242-new) merge 解决冲突 10 months ago
王杰 11b57452c0 Merge branch 'uat-temp-castle-20241224-44242-new' into test 10 months ago
王杰 4fda271266 Merge branch 'uat-temp-castle-2412250942-44253' into test 10 months ago
王杰 1abf6b9997 Merge branch 'uat-temp-wj-2412260000-44069' into test 10 months ago
王杰 e5ca95bbd4 Merge branch 'uat-temp-wj-2412240000-44246' into test 10 months ago
王杰 75ef282bcf 44423 返工作业页面增加排序拆解按钮 merge 解决冲突 10 months ago
王杰 559e87f8b4 Merge branch 'dev-temp-castle-2412191916-44449' into test 10 months ago
王杰 601b16567a 44630 读胎膜信号工步，无法适配柔性焊流程，需要优化 10 months ago
王杰 e602f615b9 44423 返工作业页面增加排序拆解按钮 10 months ago
王杰 35f98ef220 44630 读胎膜信号工步，无法适配柔性焊流程，需要优化 10 months ago
王杰 7462388c13 44630 读胎膜信号工步，无法适配柔性焊流程，需要优化 10 months ago
王杰 c6570b2916 44423 返工作业页面增加排序拆解按钮 10 months ago
王杰 a39dad81eb 44425 当有多个线边库位的情况，电子化检验的来源库位如何获取 10 months ago
王杰 fe5275dcce 44514 料包绑定条码列显示全，扫描的条码需要增加定位 (修改提示信息) 10 months ago
王杰 ed5bb4bd66 44586 排序线客户条码下线后，在其它工位重新扫描条码状态改为在加工 10 months ago
王杰 b79667bf09 44586 排序线客户条码下线后，在其它工位重新扫描条码状态改为在加工 10 months ago
王杰 ec9bc99df3 44586 排序线客户条码下线后，在其它工位重新扫描条码状态改为在加工 10 months ago
王杰 c544b33b99 44613 未完成数量不能小于0 10 months ago
王杰 4e6102f15f 44609 油漆线增加一套打印模版 10 months ago
xiangwei.zhang df69bc6293 未完成数量不能小于0 10 months ago
王杰 375b196b3f 合并dev-temp-castle-2412201550-44316 存在冲突 fork uat 后 copy dev 的工单类 后 再copy 44316改动的地方 10 months ago
王杰 414021eee0 44246 每件正常做完，背景变蓝，而报错时背景闪红 10 months ago
castle.zang b335bdd105 修复bug 44253 同Pisces，零件发运组/发运组明细可以实现“前道工艺”校验 10 months ago
王杰 b75199dadc 44425 当有多个线边库位的情况，电子化检验的来源库位如何获取 10 months ago
castle.zang 29cf5385d9 设置扫描的是包装 10 months ago
王杰 70f24a27b4 Merge branch 'uat-temp-xw-2412241000-44315' into test 10 months ago
xiangwei.zhang 6d5faf79cd 二次电子化初检，需要区分批次和单件 10 months ago
castle.zang 4002a1ac61 fix bug 44242 PCN:装箱防错，已经关箱的箱条码，如果重复扫描，不需要重置，可以扫描下一个需要装箱的条码 10 months ago
王杰 3626cdb3ce 44507 发运校验，大小写校验去除、需要启用“扫描方式判断” 10 months ago
王杰 4d64f91d2c 44449 新增Leo接口，通过报工条码查询零件号 10 months ago
王杰 0d6824c1db 44507 发运校验，大小写校验去除、需要启用“扫描方式判断” 10 months ago
王杰 d6a455ba77 Merge branch 'dev-temp-wj-2412200000-00000' into test 10 months ago
王杰 9972bcec04 合并44480 扫描一个设备ID, 显示的还是所有的点检单, 不是这个设备的点检单 (dev_temp_xw_20241220140000_44480) 解决冲突 10 months ago
王杰 e12c33f573 Merge branch 'dev-temp-workorder-report' into test 10 months ago
王杰 a35ae3fab0 44486 MES:加工管理工位补充加工记录：打印件,自进自出,未加工完成未知后,再次扫描被误识别为外协件 10 months ago
王杰 340da17f68 44315 条码需要完成质检,再重新录入电子化检验 10 months ago
xiangwei.zhang cc88f3dd79 条码需要完成质检,再重新录入电子化检验 10 months ago
王杰 1dca0cb3f3 打印件,自进自出,未加工完成未知后,再次扫描被误识别为外协件的问题修复 10 months ago
xiangwei.zhang a611078a51 合并代码冲突问题 10 months ago
王杰 7892031fa8 合并 dev-temp-xw-2412201000-44315 解决冲突 11 months ago
王杰 6e83356ec4 排序拆解 11 months ago
xiangwei.zhang 523991461e 重复报工导致报错修改 11 months ago
xiangwei.zhang ea51058c7b 条码需要完成质检,再重新录入电子化检验 11 months ago
castle.zang 03f6e6fbce 新增Leo接口，通过报工条码查询零件号 11 months ago
王杰 f95fbce203 Merge branch 'dev-temp-caslte-241218-44247' into dev-temp-workorder-report 11 months ago
王杰 379aad9ba4 bom 查询条件 增加配置 11 months ago
castle.zang c3324d4736 fix bug 44247 装箱防错分外协件和自制件，自制件的情况下可以不用维护扫描规则 11 months ago
王杰 0994ffd413 Merge branch 'dev-temp-wj-2412180000-44399' into dev 11 months ago
王杰 4a3e42f31f 44399 工位表的工位图的file_ID取 mes_media_file_cfg表的ID 11 months ago
王杰 103f2dcd07 44399 工位表的工位图的file_ID取 mes_media_file_cfg表的ID 11 months ago
王杰 fab425a2db Merge branch 'dev-temp-caslte-241218-44247' into dev 11 months ago
王杰 644a60aacf merge dev-temp-wj-2412180000-00000 :pda产品加工记录查询报表修改 解决冲突 11 months ago
王杰 dd3dddd97f 产品加工记录 查询 报表 页面数据展示优化 (增加当前条码的最新状态工位质量等信息, 修复加工记录列表零件状态空的问题) 11 months ago
castle.zang 35a7dce7f9 fix bug 44247 装箱防错分外协件和自制件，自制件的情况下可以不用维护扫描规则 11 months ago
王杰 c391180ce7 Merge branch 'dev-temp-castle-20241217-44178' into dev 11 months ago
castle.zang f6326549ae 修复bug 44178 不要修改NC判定人 11 months ago
王杰 372b82522c Merge branch 'dev-temp-wj-2024160000-00000' into dev 11 months ago
王杰 5b22c555e2 武汉油漆线批量打印 解决 没有去掉编码规则里面前缀的问题 11 months ago
王杰 62faf00e3d Merge branch 'dev-temp-wj-2412120000-44244' into test 11 months ago
王杰 be69327589 Merge branch 'dev-temp-wj-2412120000-44244' into dev 11 months ago
王杰 570e2bfab1 44244 PDA上允许用户删除点检单，并且同步到WEB端 修改提示信息 11 months ago
xiangwei.zhang b024cfd6d4 修复抛异常依然加工记录成功报工 11 months ago
王杰 5e4175614d 解决冲突 11 months ago
王杰 3a1ddfe318 武汉油漆线批量打印 11 months ago
王杰 49716d9adb Merge branch 'dev-temp-wj-2024150000-00000' into dev 11 months ago
王杰 ae286d8f20 Merge branch 'dev-temp-castle-2412131826-44281' into dev 11 months ago
王杰 323c326f2e Merge branch 'dev-temp-wj-2024130000-00000' into dev 11 months ago
王杰 56efc17296 1. 生产过程控制 工步正确提示音(匹配成功加工规则/匹配成功装配件);2.生产过程控制 工步删除部分提示信息(扫描/读装配件/匹配装配件/保存装配件 精简提示信息);3.生产过程控制 工步保存加工数/显示加工数/清除加工数 逻辑调整 (工位图跟加工数同时维护时, 优先展示工位图, 并且仍统计加工数(原逻辑:加工数优先展示));4.生产过程控制 工步非排序打印, 不打印时不再发送空打印信息给客户端, 同时不再变更条码的打印状态, 并不再提示打印成功;5.生产过程控制 工步排序打印, 查询工单 查询方式 调整, 不使用in查询;6.生产过程控制 展示组件信息发送逻辑变更: 排序/非排序 工单信息/班次班组/工位图(加工数)/队列表格 改为一次性发送到客户端 11 months ago
王杰 e14d752618 零件条码统计工步; 保存激光装配件工步 11 months ago
castle.zang 3e308b130c 修复bug 44281 产品加工记录表，电测试开始时间和结束时间没赋值 11 months ago
王杰 cbca3e6e73 解决冲突 11 months ago
王杰 bf87b62618 Merge branch 'dev-temp-wj-2412120000-44263' into dev 11 months ago
王杰 7570c129c7 Merge branch 'dev-temp-wj-2412110000-44153' into dev 11 months ago
王杰 222e199760 Merge branch 'dev-temp-wj-2412120000-44290' into dev 11 months ago
王杰 420f043fd1 PDA上允许用户删除点检单，并且同步到WEB端 11 months ago
xiangwei.zhang e3e48e15ea Merge remote-tracking branch 'origin/dev' into dev 11 months ago
xiangwei.zhang e4a67f098f 修复抛异常，但报工数量依然增加 11 months ago
王杰 5f855899a7 修改MesPcnException 方法名未被调用 不影响 11 months ago
xiangwei.zhang 53bd4ea26f Merge remote-tracking branch 'origin/dev' into dev 11 months ago
xiangwei.zhang 692a6f59e4 修复抛异常，但报工数量依然增加 11 months ago
王杰 edd8f83bc0 44296 查询bom信息考虑失效时间 11 months ago
xiangwei.zhang 872c8d629e 修复抛异常，但报工数量依然增加 11 months ago
王杰 c737d7bd54 代码 回退到 11日的版本 11 months ago
王杰 47cc8d6261 44263 PCN装箱防错：满箱关箱后，提示“当前箱条码已完成装箱。请扫描下一个箱条码” 11 months ago
jun f0a3faa7da fix bug #44263 PCN装箱防错：满箱关箱后，提示“当前箱条码已完成装箱。请扫描下一个箱条码” 11 months ago
王杰 1dedd5646a 44290 开关班管理，选完产线后自动退出到登录页面 11 months ago
jun 11824a69b7 查询bom信息考虑失效时间 11 months ago
jun e8ba2050da 44263 PCN装箱防错：满箱关箱后，提示“当前箱条码已完成装箱。请扫描下一个箱条码” 11 months ago
王杰 01ec9b90c7 44153 产品下线后，再次扫描，报错需要提醒该条码已完成下线 11 months ago
jun fe8083d9ce 非排序汇报job问题修复（报工数量成倍增加） 11 months ago
王杰 29c2d60e1c 生产过程控制 监控日志信息 修复 工单号条码物料字段未赋值的问题 11 months ago
王杰 ba90fa9666 非排序 显示装配件工步: 判断工单数量完成的提示信息优化 11 months ago
王杰 d2f2a5818c 非排序 工单完成 状态没有修改已完成问题修复 11 months ago
xiangwei.zhang bebe3d38f1 报工sql优化 11 months ago
jun 82a40b2087 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun 4ef8c28cd2 汇报job，按照产线类型区分排序条件 11 months ago
王杰 b775ab0fa1 修复一: 非排序第一个工位选了工单 order01,扫了主条码 sn001,产成是P1,不汇报;第二个工位不选工单, 扫描了上一个工位的主条码sn001,产成是P2,汇报, ---> 会导致 直接汇报到 order01上; 修复二:非排序选了工单显示装配件列表工单号一列没有值 11 months ago
王杰 4b1ef6b91c 修改 读主条码工步 提示信息 11 months ago
jun 1379930bf1 fix #bug44179 PCN电子化检验：期望创建状态的条码也可以做电子化检验 11 months ago
jun 61b9c9b7a8 等离子，包装解绑工步异常 11 months ago
xiangwei.zhang 10db05f522 发运加同步状态 11 months ago
xiangwei.zhang 43f551f8b8 发运加同步状态 11 months ago
xiangwei.zhang 0224908f94 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun f67056ef9b 返工完成空指针 11 months ago
xiangwei.zhang 592a6e0b39 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
xiangwei.zhang 95ec43db79 生产点检问题 11 months ago
jun 3d57953e27 芜湖发运，总成类型如果没有维护，同一个箱子里面不校验顺序 11 months ago
jun f82e72720f 武汉排序发运开启记忆问题修 11 months ago
jun 66d61a9d33 点检单生成，单号规则生成逻辑调整 11 months ago
jun f6ca8cdbce 装箱防错校验工艺 11 months ago
jun 9a2ff8cb0b 芜湖装箱防错增加校验零件号是否一致 11 months ago
jun 0850df7369 武汉cockpit发运防错按照散件方式写入 11 months ago
jun 642bb9a285 返工打印新条码，加工记录，装配件记录，返工单记录同步标识未更新 11 months ago
王杰 b7ec1aa8c1 非排序/排序 前道防错 工序最大执行次数 验证 问题修复 ; 工单修改工步 变更工单状态问题修复 11 months ago
jun c8ef2c8044 fix #bug 44007 排序发运增加客户订单号写入到mes_jis_shipping字段：按照广州工厂装车单字段写入。 11 months ago
jun 6fd0aad3b0 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/MesNoSortCustSnNumberRuleStrategyService.java
 11 months ago
jun a4a0390c6b 非排序生成条码规则和排序产线保持一致，特殊符号转ASCII码 11 months ago
王杰 1e010f0b71 pcn 武汉 非排序 生产通用的单件条码 增加实现 生成后再转换 11 months ago
jun 280cb1fedb 非排序生成条码规则和排序产线保持一致，特殊符号转ASCII码 11 months ago
王杰 a3ec5cfcd8 JIS 11 months ago
xiangwei.zhang 9f302719b9 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun 06bfac538f 43890 工单加工记录报表-试制工单，汇报状态修改成"无需汇报" 11 months ago
jun 5776846493 fix #bug 43977 芜湖正式环境边缘端，质检单明细表，同步状态写入为1，且有写同步状态。 11 months ago
jun 944a5029cc 装箱防错一个条码只能存在一个箱子里面 11 months ago
王杰 7e0ac2e086 目视单打印 增加日志 11 months ago
王杰 8b2a2ab8df 拉动单打印 11 months ago
王杰 9134ed28aa 拉动单打印 增加 LOCK 11 months ago
jun 1653a62923 SPS拉动单打印顺序调整 11 months ago
jun 49bc4a3d46 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun 8d689bc828 产品首检，产品末检可以只扫描一个产品条码 11 months ago
王杰 7e15f04548 离线数据回传解析增加补偿逻辑 11 months ago
xiangwei.zhang 7ea2cdb482 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
xiangwei.zhang 4d9a028d82 前一天报工改成前20天 11 months ago
jun c7c39b4212 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun 1c7193c555 装箱防错记录用户上次操作是否记忆 11 months ago
王杰 0dd22c25b8 打印 目视单 11 months ago
王杰 65cc90bf1d 修改枚举 11 months ago
王杰 697b20035e 打印目视单 11 months ago
jun 7c979a9e53 43890 工单加工记录报表-试制工单，汇报状态修改成"无需汇报" 11 months ago
jun d459d86432 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun d5f7d1dd34 点检功能点优化 11 months ago
王杰 6a28eeccb9 jis拉动单明细列增加车型代码列 11 months ago
jun 8edddb1bc0 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun a2a750489f 43927 装箱防错逻辑更新及优化 11 months ago
castle.zang a136ddb882 离线客户条码打印 11 months ago
castle.zang 648a4974b8 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
castle.zang 3781965798 离线客户条码打印 11 months ago
王杰 d4e349fc4c jis拉动单明细 列表增加 车型代码 车型名称 属性列显示 11 months ago
王杰 8663a26356 Merge branch 'dev-wuhan-temp' into dev 11 months ago
王杰 abc094b35a jis拉动单明细 列表增加 车型代码 车型名称 属性列显示 11 months ago
王杰 b93e9c737c jis拉动单明细 列表增加 车型代码 车型名称 属性列显示 11 months ago
castle.zang 6554e176f4 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 11 months ago
castle.zang fe3c342dee 离线客户条码打印 11 months ago
王杰 7c2b9b4982 Merge branch 'dev' into dev-wuhan-temp 11 months ago
jun 1010785c42 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
王杰 6e2ce20b3b 展示组件 初始化 时禁用扫描框 ； 排序工单 及条码 的上线时间赋值 扫描工单的时间 11 months ago
jun 9eed422dd7 InternalBarcodeDP条码规则去掉零件号后四位拼接 11 months ago
王杰 84a8175ed7 工位按钮 11 months ago
jun 7dd491c468 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun 36422df8eb 装配目视单查询每次查询4条数据 11 months ago
王杰 16d03491d3 打印 增加零件条码参数属性；离线部分代码提交；选择工单按钮 开始结束查询条件默认值接口返回; 11 months ago
jun a3d92f9372 点检单id信息不存在报错 11 months ago
jun 7aab622f76 目视单打印空指针 11 months ago
castle.zang 34f8cb319f Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 11 months ago
castle.zang 18fee22d4f 打印目视单-装配件有相同展示序号的零件需要合并 11 months ago
jun c201703e5c 点检单页面查询问题修复 12 months ago
jun f079ee5f03 生产过程控制查询工单增加时间查询条件 12 months ago
jun 50c46a27e4 43770 装箱防错需要增加工艺防错 12 months ago
jun d7587a5bb6 生产过程控制，查询工单增加班次范围查询条件 12 months ago
castle.zang a3c5a034fe Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 12 months ago
castle.zang 82afd7d558 打印目视单重复-增加redis锁,防止一个产线和零件生产组发送同时有多个请求，获取到相同的数据进行打印 12 months ago
jun 996af9cf85 设备点检功能变更开发 12 months ago
jun ac90d30220 设备点检最新方案调整 12 months ago
castle.zang d2e0a8649e 打印目视单-PTR转P 12 months ago
王杰 febca18a14 离线表 12 months ago
王杰 402de6f23b 离线 12 months ago
jun 649d66e90f Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 12 months ago
jun ce72090531 排序汇报逻辑调整 12 months ago
jun 0852177791 发运问题修复 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
jun c0c2b0f92b mes_jis_shipping表增加发运组字段 12 months ago
王杰 624fcce42b 可复用条码 bug 12 months ago
jun b1941ee5ac Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 12 months ago
jun 51567a7b7f 广州发运慢问题修复 12 months ago
王杰 490ca9a003 排序装配件 逻辑调整 12 months ago
jun 824ffb83b4 排序发运校验扫描确认零件方式是否维护 12 months ago
jun 8305c1b75a SPS拉动单顺序，增加客户单号 12 months ago
castle.zang f1b2f1ce53 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 12 months ago
castle.zang a529a5fb77 打印目视单-description 12 months ago
王杰 1c3e2656d8 排序 跳过 12 months ago
castle.zang 90438bf32a Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 12 months ago
王杰 bb78d98afc 注释代码 12 months ago
castle.zang 9d14b66fcb 装配目视单打印时间 12 months ago
jun c31a240bbc SPS单据打印优化，增加每次查询条数 12 months ago
王杰 872f8e9413 去除离线生产配置 12 months ago
jun c3d079fa83 Merge branch 'dev' into dev-wuhan-temp 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
 12 months ago
jun 21b501f5fd 合并冲突 12 months ago
jun a25c3993c5 SPS单据打印车型名称 12 months ago
xiangwei.zhang 3509bc88d2 MesJisShipping carNo 赋值问题 12 months ago
王杰 f95fbb750d 装配件前道防错 bug 12 months ago
xiangwei.zhang 63bf825875 点检校验设备id 12 months ago
jun 4051f5889f 生产控制选择工单时，查询零件条件无效 12 months ago
jun d8335872e4 非排序CBR汇报，bom_size值错误 12 months ago
jun 93dd002b40 JIS拉动报空指针异常 12 months ago
jun 4d80911aef 电子化检验问题修复 12 months ago
jun f297e1c4c5 客户条码打印问题修复 12 months ago
jun 4aed6c4887 SPS拉动单据打印优化 12 months ago
xiangwei.zhang 77c351c23d BTO工单报工，工作中心用生产版本的工作中心 12 months ago
xiangwei.zhang 1d1911a8ad 首检，打印条码也能首检 12 months ago
jun a2dc24de4c 发运增加扫描日志信息 12 months ago
jun 5d48b239ff Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 12 months ago
jun 07e0329195 打印模板问题修复 12 months ago
王杰 1041100674 自进自出 生成重复条码 问题修改 12 months ago
xiangwei.zhang a7e53047ab 工单报工问题 12 months ago
jun a0e5401b33 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 12 months ago
jun a92e9ab627 打印模板事务问题修复 12 months ago
王杰 bf013da537 防错 非排序 逻辑调整 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 6855811584 排序发运扫描提示信息 12 months ago
jun 2d58f43022 发运扫描提示信息 12 months ago
王杰 a237d0672e 可复用 逻辑重写 12 months ago
jun 5e3ada454c Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 12 months ago
jun 4a6eba09aa 43605 装箱防错：扫描已经发运的条码，未报错 12 months ago
王杰 42e0c41afd 装配件 12 months ago
王杰 79ed2e8c90 裁片 12 months ago
jun dccae499f3 43661 排序发运扫描条码时，同序号的零件也需要校验扫描顺序 12 months ago
xiangwei.zhang f3cc04669f Merge branch 'dev' into dev-wuhan-temp 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
 1 year ago
castle.zang a319b05ce9 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 1 year ago
王杰 cfd48f4b3e 包装定义 字段错误 1 year ago
王杰 1e146c8596 裁片工单工步 修改 1 year ago
castle.zang a0e27add57 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 1 year ago
王杰 dae94f2c07 装配件二次确认 排序线 1 year ago
jun 72b58c2130 43624 返工作业：打印新条码后，单据无法点击返工完成。 1 year ago
jun 0e2fb59a96 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 1 year ago
jun 0742266b50 排序发运校验客户零件号 1 year ago
王杰 15f8d56864 离线同步JOB 1 year ago
jun 880efd60cd 报表问题修复 1 year ago
xiangwei.zhang 4a40b51e9a 设备停机合并 1 year ago
xiangwei.zhang d924f8a73d 关闭的单据也需要报工 1 year ago
castle.zang 3d77e70d79 离线检查是否拉数据 1 year ago
jun e562fd8a48 PCN开关班次问题处理 1 year ago
jun 3b3e8014b5 武汉汇报job&装配目视单打印问题修复 1 year ago
jun 36560566f1 43590 开关班管理：接班时--90002 系统异常:对象为空 1 year ago
castle.zang f682deee4d Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 1 year ago
castle.zang e689db4edb 重构sps代码 1 year ago
王杰 e4776fe0df 扫描产成零件编码 工步 1 year ago
jun c0ed1c8ce8 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 1 year ago
jun 7ebec5bbe2 裁片原材料防错-扫描条码提示信息修改 1 year ago
王杰 b5459b68f8 扫描产成零件工步 1 year ago
jun 61c351f458 芜湖发运增加唯一性校验 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
xiangwei.zhang 26bc0bcab8 设备停机修改 1 year ago
王杰 d61b2aa000 Merge branch 'dev' into dev-wuhan-temp 1 year ago
王杰 d693da28c8 扫描产成零件工步 1 year ago
jun b5ccdf6521 芜湖客户条码打印 1 year ago
jun 70e8529c4f CBR负报工逻辑调整 1 year ago
jun bd3ee9e8f7 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 1 year ago
jun 7d1cc9b556 SPS拉动单打印 1 year ago
castle.zang 540612bf09 重构sps代码 1 year ago
castle.zang 98589ffecb Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 1 year ago
castle.zang 4599f24b25 重构sps代码 1 year ago
jun be0b341aed 天桥数报表开发 1 year ago
王杰 0c7016e070 点位表 接口逻辑表 修改时间 没有值 导致程序报错 问题修复 1 year ago
王杰 96c55eaad5 排序装配件 保存 记录 bug 修复 1 year ago
jun 3f876fadc7 非排序CBR汇报 1 year ago
castle.zang 99ab2c2d85 重构sps代码 1 year ago
castle.zang 12ca42f386 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 1 year ago
castle.zang 42653ea0fd 重构sps代码 1 year ago
jun 84361a3027 查询条件没加工厂代码排查 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
xiangwei.zhang bf5f6b5c99 设备停机修改 1 year ago
jun e2433f1a78 打印模板调整 1 year ago
王杰 f021479878 采集数据 trim 1 year ago
王杰 dac4971115 客户订单号防错工步 1 year ago
jun da7c2b31bd Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 1 year ago
jun b1f27d6e72 SPS 生成webservice从MES换到PCN 1 year ago
王杰 f1dc9cd261 武汉 非排序 增加打印策略 1 year ago
jun c6bc7781b2 SPS 生成webservice从MES换到PCN 1 year ago
王杰 4b087ed17b 代码优化 1 year ago
jun 62eecf9af4 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 1 year ago
jun 9bfa68401e 排序发运逻辑调整 1 year ago
王杰 cddd64250b 装配件 匹配后 前端列表滚动条自动定位 1 year ago
王杰 7767805389 离线版本 1 year ago
jun 5830b0452b 非排序产线打印客户条码信息 1 year ago
jun 7008d4fea3 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 1 year ago
jun 18b4d11e9b CBR报工逻辑调整 1 year ago
王杰 42241d7411 发送设备加工参数 固定值 不转大写 判断依据是否包含百分号 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
castle.zang 13cb24991d Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 1 year ago
castle.zang 92fb626bd8 优化电测试-增加生产记录修改 1 year ago
王杰 c82473c72a 排序 装配件前置写库 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
王杰 253b5fd638 Merge branch 'dev-wuhan-temp' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan-temp 1 year ago
王杰 0d1769c17c 排序 装配件 前置写库 1 year ago
castle.zang 7a1b06614d 优化电测试-增加生产记录修改 1 year ago
xiangwei.zhang bd26b7762b 设备停机修改 1 year ago
王杰 5b773eb9b5 排序 装配件 实时落库 1 year ago
castle.zang d8affd4048 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 1 year ago
castle.zang ec226284ea 优化电测试-增加生产记录 1 year ago
jun 0fe1ca2ebf JIS拉动，要加跳过码，标记是跳过的 1 year ago
jun 3a187b0bf1 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 1 year ago
jun 3752c50f24 生产过程控制，排序加工单显示(跳号标黄色) 1 year ago
王杰 d3b21da384 Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
王杰 7e7304ec8d 排序 装配件 问题 1 year ago
jun d709c834d5 Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
castle.zang 54caad459e Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 1 year ago
castle.zang 409c979c0e 优化电测试 1 year ago
xiangwei.zhang aff7c237e9 设备停机修改 1 year ago
jun 428a3d8884 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 1 year ago
jun 5c758f33c0 生产过程控制，标黄的是跳号的工单，而不是有跳过的工单。 1 year ago
jun 31de710227 客户条码补打 1 year ago
王杰 5bfb403b48 Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
王杰 e92c29a07a 装配件扫描 置顶 1 year ago
castle.zang b8ec695def 电测试 1 year ago
castle.zang 2ab2ecdb80 电测试 1 year ago
jun e6aa6deb48 流程包含解绑工步[工步参数]逻辑优化 1 year ago
jun 8419842a17 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan-temp 1 year ago
jun e67dd0fe8d Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 1 year ago
jun e531d140ae CBR,排序报工逻辑调整 1 year ago
王杰 34e0e40256 Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
王杰 c7a5f904a0 代码优化 1 year ago
王杰 b118f22767 Merge branch 'master' into dev-wuhan-temp 1 year ago
王杰 5ab9d9098b 工艺参数完成 动态sql写入 1 year ago
gsz 8cb8b90b15 SPS拉动不校验强过顺序的 1 year ago
王杰 5bd431ac55 装配件显示 列增加配置 1 year ago
jun 7a4df0d184 排序发运逻辑调整 1 year ago
jun 254687ff81 第一次记录加工记录，同步标识应该为2 1 year ago
castle.zang e8b651168f Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 1 year ago
castle.zang 1ebb40569f 电测试 1 year ago
gsz 8d832557c4 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 1 year ago
gsz 84e6e65172 SPS单据打印插入PrintedSnLog表 1 year ago
jun be37923e97 排序报工演示问题修复 1 year ago
xiangwei.zhang f30dea31ba 合并广州代码 1 year 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
 1 year ago
王杰 8cce62b47d Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
王杰 fbf1bfce20 装配件排序 1 year ago
王杰 441d28d2e1 Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
王杰 27086124ae 装配件工步调整 1 year ago
王杰 b32bef4d09 装配件整腔跳过ug 1 year ago
xiangwei.zhang 48f0360fb8 加工记录时间加毫秒，客退品和电子化检验查询串的问题修改 1 year ago
王杰 2d8901489d Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
王杰 8cafc24d35 装配件整腔跳过 1 year ago
王杰 d4102a5fcf Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
王杰 5f604adc9d 显示前道所有装配件 1 year ago
gsz f3b4e08a10 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 1 year ago
gsz 4a72b849e9 JIS拉动组规则校验 1 year ago
jun b741c1deb5 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 1 year ago
jun 1a4c94f88a getById方法增加organizeCode条件 1 year ago
王杰 c419399787 Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
王杰 860b4d9c49 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 1 year ago
王杰 53ba608c16 打印 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
jun c0feb1dde4 排序发运逻辑调整 1 year ago
castle.zang c45b5724f6 暂时注释掉webservice 1 year ago
xiangwei.zhang c301a99fd2 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
xiangwei.zhang 9a20923aa9 判断可疑 1 year ago
王杰 fa064ebd7d 打印策略 零件条码编码规则 字段用错 1 year ago
gsz 01dac4fe8c 初始化料筒修改 1 year ago
castle.zang f3e2254e45 电测试开发 1 year ago
castle.zang 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
 1 year ago
王杰 0bdce60c37 Merge branch 'master' into dev-wuhan-temp 1 year ago
王杰 2ef09dee56 mes_equipment_log mes_work_cell_scan_monitor_log 分表动态sql ； 支持云工厂分表 1 year ago
gsz 630ac61e31 SPS打印增加打印时间 1 year ago
xiangwei.zhang c82eb99317 判断可疑 1 year ago
jun 94c320d2cb 排序发运逻辑调整 1 year ago
yxw 31072fac39 排序展示组件报错 1 year ago
castle.zang ad2a7f8722 电测试开发 1 year ago
yxw 8252c90f03 裁片原材料防错 1 year ago
jun 09b9c21a47 发运明细顺序校验逻辑调整 1 year ago
jun 082e83a94a 排序发运逻辑调整 1 year ago
jun 1ae36b99e2 发运数据double 1 year ago
jun d035447f29 报工增加bom总行数字段 1 year ago
王杰 838d1f82db merge dev 冲突解决 1 year ago
王杰 8930187f6f 代码优化 1 year ago
王杰 23b774af3a 工单修改工步 修改方式变更 1 year ago
王杰 893f307284 工单修改工步， 修改方式调整 1 year ago
jun 4d9d03725b Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 1 year ago
jun 24d2cd89e6 非排序报工功能开发（代码调整） 1 year ago
jun d708e96d46 非排序报工功能开发 1 year ago
xiangwei.zhang 7343c0e462 判断可疑 1 year ago
王杰 80677847b1 Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
王杰 3a81d887a5 前道防错工步 1 year ago
gsz 3b955236e6 43302 加料防错扫码流程优化 1 year ago
王杰 1a734d52d0 Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
王杰 315009b22c 合并dev 1 year ago
王杰 0f88c13f3b Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
王杰 e20e160034 合并dev 1 year ago
王杰 24fd34c088 合并dev 1 year ago
王杰 3b3edc9b46 条码修改工步 update 改成updateByProperties 1 year ago
jun 80c6aaf1f5 发运工单表中条码字段修改 1 year ago
王杰 4922e1bd58 Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
王杰 aa719fb463 通用客户条码转换逻辑变更 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
王杰 36ee2c007a 临时存储 1 year ago
王杰 797904c87a Merge branch 'dev' 1 year ago
yxw 1cf4524daf 客户条码打印 1 year ago
王杰 78fb82c88a 规则并截取右侧流水装配件规则, 生成零件条码工步需要使用此流水生成新的零件条码 1 year ago
yxw a536b82cfd 排序产线客户条码打印 1 year ago
王杰 b8cf5c7cfe byd 装配件策略 截取右侧流水 1 year ago
yxw f82c6626a1 装配目视单打印策略类字段引用修改 1 year ago
yxw f930bb092b Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 1 year ago
yxw 5eaf01b076 排序展示组件查询逻辑优化 1 year ago
gsz 44f72a56a6 PCN发运单打印页面1 1 year ago
gsz ad5934cfd8 43289 SPS拉动提示系统异常 1 year ago
xiangwei.zhang a05cd762bc 条码打印次数更新 1 year ago
王杰 d379ad543e Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
王杰 4092793204 排序流程 盲写代码 自测 问题修复 1 year ago
jun 4440d368a0 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 1 year ago
jun c9d4d0fa2f 排序汇报job开发 1 year ago
王杰 b3cdc996ed Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
王杰 7176608355 排序 加工记录 根据工单装配件写加工记录的汇报方式状态汇报零件号 1 year ago
jun 92845822c7 打印模板开发 1 year ago
xiangwei.zhang f9415668a3 判断可疑 1 year ago
王杰 70adc2f3a9 条码生成 对象增加 生产线 工位 1 year ago
王杰 2b362500b1 条码生成 对象增加 生产线 工位 1 year ago
xiangwei.zhang 70456a3df5 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
xiangwei.zhang 3d9b4e6aa2 判断可疑 1 year ago
王杰 9b685988ed Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
yxw 19dc318f2f Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 1 year ago
yxw bd4d547f4b 保存裁片工单结果工步-裁片工单号获取方式修改 1 year ago
王杰 3e11aff239 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 1 year ago
王杰 1cb80d9451 merge dev pom冲突 1 year ago
yxw c8576f6f92 1、MesProductionPartContext 增加cutQty（裁片工单数量） 
2、裁片工单绑定问题修复
 1 year ago
yxw 0f3a1cb964 1、MesProductionPartContext 增加cutQty（裁片工单数量） 
2、裁片工单绑定问题修复
 1 year ago
王杰 947fa99b48 工位扫描 监控日志信息 设备代码判空补字段值 1 year ago
xiangwei.zhang f2a453f549 判断可疑 1 year ago
王杰 df5757bec8 排序 保存加工结果 1 year ago
yxw d1b5e32076 非排序产出零件条码 去掉cutWorkOrderNo 字段 1 year ago
yxw fac38e24c5 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 1 year ago
yxw bdceeb26f5 排序展示组件开发 1 year ago
gsz c94b44ceee Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 1 year ago
gsz 176b418709 排序返工作业2 1 year ago
王杰 f441b07b4b 上下文 获取生产线类型 不验证工序 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