Commit Graph

1708 Commits (561e4c9c54314b7e4714c394418b55698c076fd9)

Author SHA1 Message Date
xiangwei.zhang a5888f64cc Merge branch 'uat-temp-xw-2501030000-44701' into dev 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
王杰 64f890c0f3 Merge branch 'uat-temp-wj-2501030000-44697' into dev 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 c0032ac259 Merge branch 'uat-temp-copydevorderservice' into dev 10 months ago
xiangwei.zhang 37013c67fb 44657 前一天报工job失败,加入到备注中 10 months ago
xiangwei.zhang 669df79e4e Merge branch 'uat-temp-copydevorderservice' into dev 10 months ago
xiangwei.zhang f0ba25d59b 44657 报工前一天job 修改remark 10 months ago
王杰 9d409e46a5 Merge branch 'uat-temp-wj-2412300000-44653' into dev 10 months ago
王杰 8402aab2e1 44653 电子化检验输入数量支持小数点输入 10 months ago
王杰 f73c121688 Merge branch 'uat-temp-wj-2412300000-44653' into dev 10 months ago
王杰 e38af16025 44653 电子化检验输入数量支持小数点输入 10 months ago
王杰 967f659692 Merge branch 'uat-temp-wj-2412270000-44586' into dev 10 months ago
王杰 ef4d9490c7 44631 生产过程控制D01CR01A产线,提示“系统异常” (第二次修改: 改工步枚举属性判断错误) 10 months ago
王杰 9328bee512 Merge branch 'uat-temp-wj-2412310000-44673' into dev 10 months ago
王杰 985df86769 Merge branch 'uat-temp-wj-2412310000-44666' into dev 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
王杰 70dea8e2fe Merge branch 'uat-temp-wj-2412310000-44666' into dev 10 months ago
王杰 144548665f 44666 PCN-CBR产成条码打印逻辑优化 10 months ago
王杰 3e7aae0b5d Merge branch 'uat-temp-wj-2412300000-44653' into dev 10 months ago
王杰 4b310004a6 44509 需要边端开发和零件条码状态相关的报表,用来展示未知条码 merge uat-temp-castle-2412301006-44509 解决冲突 10 months ago
王杰 c927074ac7 44635 芜湖排序发运打印 44520 工位端排序发运打印功能 merge uat-temp-castle-2412301037-44520\&44635 解决冲突 同时包含了44258 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
王杰 959e355b57 Merge branch 'uat-temp-copydevorderservice' into dev 10 months ago
castle.zang e992c4de6d 44635 芜湖排序发运打印 10 months ago
xiangwei.zhang f71fb409d9 未完成数量计算错误-44633 10 months ago
王杰 0fce6f26a0 Merge branch 'uat-temp-wj-2412270000-44586' into dev 10 months ago
王杰 343912944b Merge branch 'uat-temp-wj-2412300000-44631' into dev 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
王杰 2d39875eb4 44632 零件发运组 明细不需要校验是否为空 merge解决 之前改的装箱防错的冲突,还有ConstWords的冲突 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
王杰 5e7541a1cd Merge branch 'uat-temp-wj-2412280000-44630' into dev 10 months ago
王杰 601b16567a 44630 读胎膜信号工步,无法适配柔性焊流程,需要优化 10 months ago
王杰 0da9863cf7 Merge branch 'dev-temp-wj-2412190000-44423' into dev 10 months ago
王杰 e602f615b9 44423 返工作业页面增加排序拆解按钮 10 months ago
王杰 0552ad769d Merge branch 'uat-temp-wj-2412280000-44630' into dev 10 months ago
王杰 35f98ef220 44630 读胎膜信号工步,无法适配柔性焊流程,需要优化 10 months ago
王杰 c8aee6a401 Merge branch 'uat-temp-wj-2412280000-44630' into dev 10 months ago
王杰 7462388c13 44630 读胎膜信号工步,无法适配柔性焊流程,需要优化 10 months ago
王杰 270bf21986 分支提交错误, 代码回退 10 months ago
王杰 567a81d3bf Merge branch 'dev-temp-wj-2412190000-44423' into dev 10 months ago
王杰 c6570b2916 44423 返工作业页面增加排序拆解按钮 10 months ago
王杰 98f999bc7e 44630 读胎膜信号工步,无法适配柔性焊流程,需要优化 10 months ago
王杰 5aaa08b8b7 Merge branch 'uat-temp-wj-2412241000-44315-44425' into dev 10 months ago
王杰 a39dad81eb 44425 当有多个线边库位的情况,电子化检验的来源库位如何获取 10 months ago
王杰 7a52fea201 Merge branch 'uat-temp-wj-2412270000-44586' into dev 10 months ago
王杰 20adcbfa3c Merge branch 'uat-temp-wj-2412270000-44514' into dev 10 months ago
王杰 fe5275dcce 44514 料包绑定条码列显示全,扫描的条码需要增加定位 (修改提示信息) 10 months ago
王杰 ed5bb4bd66 44586 排序线客户条码下线后,在其它工位重新扫描条码状态改为在加工 10 months ago
王杰 b79667bf09 44586 排序线客户条码下线后,在其它工位重新扫描条码状态改为在加工 10 months ago
王杰 ec9bc99df3 44586 排序线客户条码下线后,在其它工位重新扫描条码状态改为在加工 10 months ago
王杰 4890c50a76 Merge branch 'uat-temp-copydevorderservice' into dev 10 months ago
王杰 c544b33b99 44613 未完成数量不能小于0 10 months ago
王杰 70bd1fd55b Merge branch 'uat-temp-castle-2412250942-44253' into dev 10 months ago
王杰 8ba822d174 Merge branch 'uat-temp-wj-2412260000-44069' into dev 10 months ago
王杰 4e6102f15f 44609 油漆线增加一套打印模版 10 months ago
xiangwei.zhang df69bc6293 未完成数量不能小于0 10 months ago
王杰 1dd4c179f6 Merge branch 'uat-temp-wj-2412241000-44315-44425' into dev 10 months ago
王杰 4d5d0cfb52 Merge branch 'uat-temp-wj-2412240000-44246' into dev 10 months ago
王杰 0d0205d48f Merge branch 'uat-temp-copydevorderservice' into dev 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
王杰 d0b86456de Merge branch 'uat-temp-castle-20241224-44242-new' into dev 10 months ago
castle.zang 29cf5385d9 设置扫描的是包装 10 months ago