Commit Graph

1902 Commits (b809ff0a7c3512b40ebfdd7b96f7e23d43fcef1f)

Author SHA1 Message Date
王杰 a5788a338a 合并解决冲突 3 months ago
王杰 1a5c2272e7 红外焊超差预警 3 months ago
xiangwei.zhang bee36e00ec Merge branch 'dev-temp-xw-202502050000-44881' into dev 3 months ago
xiangwei.zhang 4fb5c3d50b 44881 MES:裁片补片逻辑更新&裁片报表 3 months ago
xiangwei.zhang de73649c13 Merge remote-tracking branch 'origin/dev' into dev 4 months ago
xiangwei.zhang 8a55afc42c Merge branch 'uat-temp-xw-202501250000-44863' into dev 4 months ago
xiangwei.zhang 4e543f517f 44863 PCN-零件生产组增加“禁用Bom版本号”开关最终确认版逻辑优化 4 months ago
王杰 21e3ad07d4 Merge branch 'test-temp-wj-250117-pack' into dev 4 months ago
王杰 fcd7d440c5 包装补打印 4 months ago
王杰 be895cc23a Merge branch 'test-temp-wj-250117-pack' into dev 4 months ago
王杰 dca4d89330 包装补打印 4 months ago
王杰 4c8f46dd44 Merge branch 'test-temp-wj-250117-pack' into dev 4 months ago
王杰 c59e47601d 包装补打印 4 months ago
王杰 27fb491e3e Merge branch 'test-temp-wj-250117-pack' into dev 4 months ago
王杰 712a6603d9 打包 4 months ago
王杰 61f6b12119 Merge branch 'test-temp-wj-250117-pack' into dev 4 months ago
王杰 5bfed2ca8e 打包 4 months ago
王杰 6f5b1e5de0 Merge branch 'test-temp-wj-250117-pack' into dev 4 months ago
王杰 bc39704375 打包 4 months ago
王杰 ba025d2f01 Merge branch 'test-temp-wj-250117-pack' into dev 4 months ago
王杰 32b9447a35 打包 4 months ago
王杰 941b979c49 Merge branch 'test-temp-wj-250117-pack' into dev 4 months ago
王杰 17818f5ea2 打包 4 months ago
王杰 b75e9198d9 revert c9e1ee1024
revert 打包
4 months ago
王杰 c9e1ee1024 打包 4 months ago
王杰 3b060d3496 Merge branch 'test-temp-wj-250117-pack' into dev 4 months ago
王杰 91fbdbed6a 打包 4 months ago
王杰 ebdb79e7bc Merge branch 'test-temp-wj-250117-pack' into dev 4 months ago
王杰 d8fd96cf28 Merge branch 'uat-temp-wj-250122-44937' into dev 4 months ago
王杰 548ba84f08 44937 PCN:批量手动报工页面,排序方式按照工单号升序 4 months ago
王杰 bd4f18ed84 重庆打包 4 months ago
王杰 1f6fe5e4a0 零件打包 4 months ago
王杰 96f0278f47 Merge remote-tracking branch 'origin/uat-temp-xw-202501170000-44873' into uat 4 months ago
王杰 f241329b41 Merge remote-tracking branch 'origin/dev-temp-xw-202501160000-44858' into uat 4 months ago
王杰 e5cb750081 Merge remote-tracking branch 'origin/dev-temp-nht-202501150000-44584' into uat 4 months ago
王杰 7ea9817b27 打包 4 months ago
王杰 a7b4f79a5f Merge branch 'test-temp-wj-2501170000-00000' into test 4 months ago
王杰 6893124d4c Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 4 months ago
王杰 561e4c9c54 Merge branch 'test-temp-wj-2501170000-00000' into dev 4 months ago
王杰 6d4ed9fe69 44887 离线数据回传问题修复 4 months ago
王杰 5aacd09a61 打包 4 months ago
jun 908910e446 Merge branch 'test-demp-ljs-202501181621-44904' into dev 4 months ago
jun 6747c5f14b 44904 PCN-发运异常处理 4 months ago
王杰 2759a1c621 Merge remote-tracking branch 'origin/test-demp-ljs-202501081531-44896' into test 4 months ago
jun 025d7c5f5c Merge branch 'test-demp-ljs-202501181531-44896' into dev 4 months ago
jun 15c86109d5 44896 生产汇报边端同步云端问题修复 4 months ago
王杰 6892759782 44435 PCN:排序下线条码打印配置follow Pisces 4 months ago
王杰 0c74c405de 重庆打包 4 months ago
xiangwei.zhang bc088ff4a1 Merge branch 'uat-temp-xw-202501170000-44873' into dev 4 months ago
xiangwei.zhang 2acd70ca6a 44873 PCN-批量报工页面,工单展示顺序基于工单序号正序排列显示
44883 MES:PCN-批量报工,写入报工表中未写入bom_code
4 months ago
王杰 03645c13f3 Merge branch 'test-temp-wj-2501170000-00000' into dev 4 months ago
王杰 5349353ca8 44887 离线数据回传问题修复 4 months ago
xiangwei.zhang e548feffd9 Merge branch 'dev-temp-nht-202501160000-44744' into dev 4 months ago
xiangwei.zhang 8413458661 Merge branch 'dev-temp-xw-202501160000-44858' into dev 4 months ago
xiangwei.zhang db924c2dfa 44858 PCN:设备报废的数据在mes_part_inspection修改人为空,并且数据自动由可疑转正常,同时没有产生初判的移库
44805 PCN:电子化检验选零件的页面增加单位
4 months ago
Jason e1bc7f21a0 44744 修复同一条码完成返工后完成质检成功,后续无法再次操作电子化检验问题 4 months ago
王杰 51ba9f967f Merge remote-tracking branch 'origin/uat-temp-castle-2501090929-44791' into test 4 months ago
王杰 14939ea2e5 Merge branch 'uat-temp-wj-2501090000-44517' into test 4 months ago
王杰 d8ca52a932 Merge branch 'uat-temp-wj-2501090000-44517' into dev 4 months ago
王杰 712fb6b943 44517 装箱防错后吐条码需求(芜湖) 4 months ago
王杰 fb81e4726d Merge branch 'uat-temp-wj-2501090000-44517-bak' into dev 4 months ago
王杰 86a6b595fd 44517 装箱防错后吐条码需求(芜湖)临时保存提交 4 months ago
王杰 5300afd180 Merge remote-tracking branch 'origin/dev-temp-nht-202501150000-44584' into dev 4 months ago
王杰 b695fc1742 44517 装箱防错后吐条码需求(芜湖)临时保存提交 4 months ago
Jason df7ac14ebe 44584 修复排序工单发运完成后,条码状态未更新为发运问题。 4 months ago
xiangwei.zhang 1d756afd7c Merge branch 'dev-temp-xw-202501150000-44838' into dev 4 months ago
xiangwei.zhang b7020bb6f4 44838 MES:裁片补片逻辑更新&裁片报表 4 months ago
王杰 3707bea56e Merge branch 'test-temp-wj-2501140000-44828' into test 4 months ago
王杰 f1f5a07862 Merge remote-tracking branch 'origin/dev-temp-xw-202501031636-44657' into test 4 months ago
王杰 a8ee0646d0 Merge branch 'uat-temp-wj-2412300000-44653' into test 4 months ago
王杰 92014561a3 Merge branch 'test-temp-wj-2501140000-44828' into dev 4 months ago
王杰 315703f41d 44828 PCN: 装箱防错需要校验条码的状态 4 months ago
王杰 88f4e451d1 Merge branch 'uat-temp-wj-2501090000-44517' into dev 4 months ago
王杰 96900f5e7b 44517 装箱防错后吐条码需求(芜湖) 4 months ago
王杰 dcb468ec1f Merge branch 'uat-temp-wj-2501090000-44517' into dev 4 months ago
王杰 5e5e2b4de8 44517 装箱防错后吐条码需求(芜湖) 4 months ago
王杰 ff4cdedf63 Merge branch 'uat-temp-wj-2501090000-44517' into dev 4 months ago
王杰 8daaa603bf 44517 装箱防错后吐条码需求(芜湖) 4 months ago
王杰 5a5b759b3a Merge branch 'uat-temp-wj-2501090000-44517' into dev 4 months ago
王杰 f9c6b5e81b 44517 装箱防错后吐条码需求(芜湖) 4 months ago
王杰 20944bc9e6 Merge branch 'uat-temp-wj-2501090000-44517' into dev 4 months ago
王杰 3bdc59534c 44517 装箱防错后吐条码需求(芜湖) 4 months ago
王杰 d27ace0cce Merge branch 'uat-temp-wj-2501090000-44517' into dev 4 months ago
王杰 4a9dabfbf3 44517 装箱防错后吐条码需求(芜湖) 4 months ago
王杰 603adecdd4 Merge remote-tracking branch 'origin/dev-temp-xw-202501031636-44657' into dev 4 months ago
王杰 47e87b8fe1 44517 装箱防错后吐条码需求(芜湖) 4 months ago
臧学普 d1fbcb8ee7 Merge branch 'uat-temp-castle-2501090929-44791' into dev 4 months ago
臧学普 8d8d54eafb 44791 迁移线末大屏看板到 pcn 4 months ago
xiangwei.zhang fd82011fab 该类改加工记录毫秒 回退版本 4 months ago
xiangwei.zhang f848b4bcbf Merge branch 'uat' into uat-temp-copydevorderservice 4 months ago
王杰 b549b024ab Merge remote-tracking branch 'origin/uat-temp-castle-2501090929-44791' into dev 4 months ago
王杰 c76ac1649a Merge remote-tracking branch 'origin/test-temp-wj-2501060000-44729' into dev 4 months ago
臧学普 eee50bfcdf 44791 迁移线末大屏看板到 pcn 4 months ago
xiangwei.zhang 057f5f0bb1 44729 PDA: 可疑转正常的条码,可以进行发运扫描。 4 months ago
xiangwei.zhang a5888f64cc Merge branch 'uat-temp-xw-2501030000-44701' into dev 4 months ago
xiangwei.zhang 7da60df921 Merge branch 'uat-temp-xw-2501030000-44701' into test 4 months ago
xiangwei.zhang 685431353d 44703 返工完成后,产生2笔不一样的事务 因合并代码问题修复 4 months ago
王杰 52ee8d84fa Merge branch 'uat-temp-wj-2501030000-44697' into test 4 months ago
王杰 64f890c0f3 Merge branch 'uat-temp-wj-2501030000-44697' into dev 4 months ago
王杰 78f658d183 44697 创建状态允许电子化检验 4 months ago
王杰 1edc7329f6 Merge branch 'uat-temp-wj-2412270000-44514' into uat 4 months ago
王杰 ffdf5491c4 Merge branch 'uat-temp-copydevorderservice' into uat 4 months ago
王杰 cd2fdd6026 Merge branch 'uat-temp-wj-2412310000-44666' into uat 4 months ago
王杰 93f6ee6188 Merge branch 'uat-temp-wj-2412300000-44631' into uat 4 months ago
王杰 f0a63f47fb Merge branch 'uat-temp-wj-2412270000-44586' into uat 4 months ago
王杰 b89c6e4775 Merge branch 'uat-temp-wj-2412280000-44630' into uat 4 months ago
王杰 1d4ac69a53 44509 需要边端开发和零件条码状态相关的报表,用来展示未知条码 merge uat-temp-castle-2412301006-44509 解决冲突 4 months ago
王杰 8501f466ea Merge branch 'uat-temp-castle-2412301037-44520&44635' into test 4 months ago
王杰 8e519ae585 Merge branch 'uat-temp-wj-2412270000-44514' into test 4 months ago
王杰 861ff14129 Merge branch 'uat-temp-copydevorderservice' into test 4 months ago
王杰 9f793bb1b8 Merge branch 'uat-temp-wj-2412310000-44673' into test 4 months ago
王杰 02043ac59f Merge branch 'uat-temp-wj-2412310000-44666' into test 4 months ago
王杰 8566676e9e Merge branch 'uat-temp-wj-2412300000-44631' into test 4 months ago
王杰 f1fa426dc5 Merge branch 'uat-temp-wj-2412270000-44586' into test 4 months ago
王杰 4b9beb099d Merge branch 'uat-temp-wj-2412280000-44630' into test 4 months ago
xiangwei.zhang c0032ac259 Merge branch 'uat-temp-copydevorderservice' into dev 4 months ago
xiangwei.zhang 37013c67fb 44657 前一天报工job失败,加入到备注中 4 months ago
xiangwei.zhang 669df79e4e Merge branch 'uat-temp-copydevorderservice' into dev 4 months ago
xiangwei.zhang f0ba25d59b 44657 报工前一天job 修改remark 4 months ago
王杰 9d409e46a5 Merge branch 'uat-temp-wj-2412300000-44653' into dev 4 months ago
王杰 8402aab2e1 44653 电子化检验输入数量支持小数点输入 4 months ago
王杰 f73c121688 Merge branch 'uat-temp-wj-2412300000-44653' into dev 4 months ago
王杰 e38af16025 44653 电子化检验输入数量支持小数点输入 4 months ago
王杰 967f659692 Merge branch 'uat-temp-wj-2412270000-44586' into dev 4 months ago
王杰 ef4d9490c7 44631 生产过程控制D01CR01A产线,提示“系统异常” (第二次修改: 改工步枚举属性判断错误) 4 months ago
王杰 9328bee512 Merge branch 'uat-temp-wj-2412310000-44673' into dev 5 months ago
王杰 985df86769 Merge branch 'uat-temp-wj-2412310000-44666' into dev 5 months ago
王杰 e01eaadf05 44666 PCN-CBR产成条码打印逻辑优化 5 months ago
xiangwei.zhang df366ba46b 44673 datasync同步与报工JOB同一秒执行同一条加工记录,导致云端为等待汇报,边端已经汇报完成 5 months ago
王杰 eb2878791f 44673 MES:datasync同步与报工JOB同一秒执行同一条加工记录,导致云端为等待汇报,边端已经汇报完成 5 months ago
王杰 70dea8e2fe Merge branch 'uat-temp-wj-2412310000-44666' into dev 5 months ago
王杰 144548665f 44666 PCN-CBR产成条码打印逻辑优化 5 months ago
王杰 3e7aae0b5d Merge branch 'uat-temp-wj-2412300000-44653' into dev 5 months ago
王杰 4b310004a6 44509 需要边端开发和零件条码状态相关的报表,用来展示未知条码 merge uat-temp-castle-2412301006-44509 解决冲突 5 months ago
王杰 c927074ac7 44635 芜湖排序发运打印 44520 工位端排序发运打印功能 merge uat-temp-castle-2412301037-44520\&44635 解决冲突 同时包含了44258 5 months ago
王杰 03029876b6 44653 电子化检验输入数量支持小数点输入 5 months ago
臧学普 e59b940238 44509 查询条码状态-删除依赖的类 5 months ago
王杰 3f0a8b2d62 Merge branch 'uat-temp-wj-2412270000-44586' into uat-temp-wj-2412300000-44653 5 months ago
臧学普 c69884d16a 44509 查询条码状态 5 months ago
臧学普 86f9128348 44509 查询条码状态 5 months ago
王杰 959e355b57 Merge branch 'uat-temp-copydevorderservice' into dev 5 months ago
臧学普 e992c4de6d 44635 芜湖排序发运打印 5 months ago
xiangwei.zhang f71fb409d9 未完成数量计算错误-44633 5 months ago
王杰 0fce6f26a0 Merge branch 'uat-temp-wj-2412270000-44586' into dev 5 months ago
王杰 343912944b Merge branch 'uat-temp-wj-2412300000-44631' into dev 5 months ago
王杰 66ec91c61a 44631 生产过程控制D01CR01A产线,提示“系统异常” 5 months ago
王杰 cc48d20729 44631 生产过程控制D01CR01A产线,提示“系统异常” 5 months ago
臧学普 b910521dc7 44509 pcn端条码报表 5 months ago
xiangwei.zhang 67c053c8bc 未完成数量计算错误 5 months ago
王杰 2d39875eb4 44632 零件发运组 明细不需要校验是否为空 merge解决 之前改的装箱防错的冲突,还有ConstWords的冲突 5 months ago
王杰 04f9abeb20 44632 零件发运组 明细不需要校验是否为空 5 months ago
王杰 e2fb2740c9 Merge branch 'uat-temp-wj-2412241000-44315-44425' into test 5 months ago
王杰 01f9898de2 44242 PCN:装箱防错,已经关箱的箱条码,如果重复扫描,不需要重置,可以扫描下一个需要装箱的条码 (uat-temp-castle-20241224-44242-new) merge 解决冲突 5 months ago
王杰 11b57452c0 Merge branch 'uat-temp-castle-20241224-44242-new' into test 5 months ago
王杰 4fda271266 Merge branch 'uat-temp-castle-2412250942-44253' into test 5 months ago
王杰 1abf6b9997 Merge branch 'uat-temp-wj-2412260000-44069' into test 5 months ago
王杰 e5ca95bbd4 Merge branch 'uat-temp-wj-2412240000-44246' into test 5 months ago
王杰 75ef282bcf 44423 返工作业页面增加排序拆解按钮 merge 解决冲突 5 months ago
王杰 559e87f8b4 Merge branch 'dev-temp-castle-2412191916-44449' into test 5 months ago
王杰 5e7541a1cd Merge branch 'uat-temp-wj-2412280000-44630' into dev 5 months ago
王杰 601b16567a 44630 读胎膜信号工步,无法适配柔性焊流程,需要优化 5 months ago
王杰 0da9863cf7 Merge branch 'dev-temp-wj-2412190000-44423' into dev 5 months ago
王杰 e602f615b9 44423 返工作业页面增加排序拆解按钮 5 months ago
王杰 0552ad769d Merge branch 'uat-temp-wj-2412280000-44630' into dev 5 months ago
王杰 35f98ef220 44630 读胎膜信号工步,无法适配柔性焊流程,需要优化 5 months ago
王杰 c8aee6a401 Merge branch 'uat-temp-wj-2412280000-44630' into dev 5 months ago
王杰 7462388c13 44630 读胎膜信号工步,无法适配柔性焊流程,需要优化 5 months ago
王杰 270bf21986 分支提交错误, 代码回退 5 months ago
王杰 567a81d3bf Merge branch 'dev-temp-wj-2412190000-44423' into dev 5 months ago
王杰 c6570b2916 44423 返工作业页面增加排序拆解按钮 5 months ago
王杰 98f999bc7e 44630 读胎膜信号工步,无法适配柔性焊流程,需要优化 5 months ago
王杰 5aaa08b8b7 Merge branch 'uat-temp-wj-2412241000-44315-44425' into dev 5 months ago
王杰 a39dad81eb 44425 当有多个线边库位的情况,电子化检验的来源库位如何获取 5 months ago
王杰 7a52fea201 Merge branch 'uat-temp-wj-2412270000-44586' into dev 5 months ago
王杰 20adcbfa3c Merge branch 'uat-temp-wj-2412270000-44514' into dev 5 months ago
王杰 fe5275dcce 44514 料包绑定条码列显示全,扫描的条码需要增加定位 (修改提示信息) 5 months ago
王杰 ed5bb4bd66 44586 排序线客户条码下线后,在其它工位重新扫描条码状态改为在加工 5 months ago
王杰 b79667bf09 44586 排序线客户条码下线后,在其它工位重新扫描条码状态改为在加工 5 months ago
王杰 ec9bc99df3 44586 排序线客户条码下线后,在其它工位重新扫描条码状态改为在加工 5 months ago
王杰 4890c50a76 Merge branch 'uat-temp-copydevorderservice' into dev 5 months ago
王杰 c544b33b99 44613 未完成数量不能小于0 5 months ago
王杰 70bd1fd55b Merge branch 'uat-temp-castle-2412250942-44253' into dev 5 months ago
王杰 8ba822d174 Merge branch 'uat-temp-wj-2412260000-44069' into dev 5 months ago
王杰 4e6102f15f 44609 油漆线增加一套打印模版 5 months ago
xiangwei.zhang df69bc6293 未完成数量不能小于0 5 months ago
王杰 1dd4c179f6 Merge branch 'uat-temp-wj-2412241000-44315-44425' into dev 5 months ago
王杰 4d5d0cfb52 Merge branch 'uat-temp-wj-2412240000-44246' into dev 5 months ago
王杰 0d0205d48f Merge branch 'uat-temp-copydevorderservice' into dev 5 months ago
王杰 375b196b3f 合并dev-temp-castle-2412201550-44316 存在冲突 fork uat 后 copy dev 的工单类 后 再copy 44316改动的地方 5 months ago
王杰 414021eee0 44246 每件正常做完,背景变蓝,而报错时背景闪红 5 months ago
臧学普 b335bdd105 修复bug 44253 同Pisces,零件发运组/发运组明细可以实现“前道工艺”校验 5 months ago
王杰 b75199dadc 44425 当有多个线边库位的情况,电子化检验的来源库位如何获取 5 months ago
王杰 d0b86456de Merge branch 'uat-temp-castle-20241224-44242-new' into dev 5 months ago
臧学普 29cf5385d9 设置扫描的是包装 5 months ago
王杰 5c568266d8 Merge branch 'dev-temp-castle-2412200948-44429' into dev 5 months ago
王杰 70f24a27b4 Merge branch 'uat-temp-xw-2412241000-44315' into test 5 months ago
臧学普 2837839ff6 统一记录errorMsg 5 months ago
王杰 069890b9c5 uat-temp-xw-2412241000-44315; uat-temp-castle-20241224-44242-new 5 months ago
xiangwei.zhang 6d5faf79cd 二次电子化初检,需要区分批次和单件 5 months ago
臧学普 4002a1ac61 fix bug 44242 PCN:装箱防错,已经关箱的箱条码,如果重复扫描,不需要重置,可以扫描下一个需要装箱的条码 5 months ago