Commit Graph

1622 Commits (3707bea56ed9333f9a1dfecd9dd2c06825600e47)
 

Author SHA1 Message Date
王杰 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
王杰 315703f41d 44828 PCN: 装箱防错需要校验条码的状态 4 months ago
xiangwei.zhang fd82011fab 该类改加工记录毫秒 回退版本 4 months ago
xiangwei.zhang f848b4bcbf Merge branch 'uat' into uat-temp-copydevorderservice 4 months ago
xiangwei.zhang 057f5f0bb1 44729 PDA: 可疑转正常的条码,可以进行发运扫描。 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
王杰 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 f0ba25d59b 44657 报工前一天job 修改remark 4 months ago
王杰 8402aab2e1 44653 电子化检验输入数量支持小数点输入 4 months ago
王杰 e38af16025 44653 电子化检验输入数量支持小数点输入 4 months ago
王杰 ef4d9490c7 44631 生产过程控制D01CR01A产线,提示“系统异常” (第二次修改: 改工步枚举属性判断错误) 4 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
王杰 144548665f 44666 PCN-CBR产成条码打印逻辑优化 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
臧学普 e992c4de6d 44635 芜湖排序发运打印 5 months ago
xiangwei.zhang f71fb409d9 未完成数量计算错误-44633 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
王杰 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