Commit Graph

1649 Commits (uat_temp-xw-202502110000-45034)
 

Author SHA1 Message Date
臧学普 f3e2254e45 电测试开发 9 months ago
臧学普 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
9 months ago
王杰 0bdce60c37 Merge branch 'master' into dev-wuhan-temp 9 months ago
王杰 2ef09dee56 mes_equipment_log mes_work_cell_scan_monitor_log 分表动态sql ; 支持云工厂分表 9 months ago
gsz 630ac61e31 SPS打印增加打印时间 9 months ago
xiangwei.zhang c82eb99317 判断可疑 9 months ago
jun 94c320d2cb 排序发运逻辑调整 9 months ago
yxw 31072fac39 排序展示组件报错 9 months ago
臧学普 ad2a7f8722 电测试开发 9 months ago
yxw 8252c90f03 裁片原材料防错 9 months ago
jun 09b9c21a47 发运明细顺序校验逻辑调整 9 months ago
jun 082e83a94a 排序发运逻辑调整 9 months ago
jun 1ae36b99e2 发运数据double 9 months ago
jun d035447f29 报工增加bom总行数字段 9 months ago
王杰 838d1f82db merge dev 冲突解决 9 months ago
王杰 8930187f6f 代码优化 9 months ago
王杰 23b774af3a 工单修改工步 修改方式变更 9 months ago
王杰 893f307284 工单修改工步, 修改方式调整 9 months ago
jun 4d9d03725b Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
jun 24d2cd89e6 非排序报工功能开发(代码调整) 9 months ago
jun d708e96d46 非排序报工功能开发 9 months ago
xiangwei.zhang 7343c0e462 判断可疑 9 months ago
王杰 80677847b1 Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
王杰 3a81d887a5 前道防错工步 9 months ago
gsz 3b955236e6 43302 加料防错扫码流程优化 9 months ago
王杰 1a734d52d0 Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
王杰 315009b22c 合并dev 9 months ago
王杰 0f88c13f3b Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
王杰 e20e160034 合并dev 9 months ago
王杰 24fd34c088 合并dev 9 months ago
王杰 3b3edc9b46 条码修改工步 update 改成updateByProperties 9 months ago
jun 80c6aaf1f5 发运工单表中条码字段修改 9 months ago
王杰 4922e1bd58 Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
王杰 aa719fb463 通用客户条码转换逻辑变更 9 months ago
王杰 b4e500dd6d 合并 dev-wuhan master(工位扫描监控日志去除分表配置,直接使用动态sql写入生产线对应的分表) 9 months ago
王杰 1c2c03dccb Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
王杰 cfed01aa5c 工位扫描 日志 去除分表 写DB改成sql执行 10 months ago
王杰 36ee2c007a 临时存储 10 months ago
王杰 797904c87a Merge branch 'dev' 10 months ago
yxw 1cf4524daf 客户条码打印 10 months ago
王杰 78fb82c88a 规则并截取右侧流水装配件规则, 生成零件条码工步需要使用此流水生成新的零件条码 10 months ago
yxw a536b82cfd 排序产线客户条码打印 10 months ago
王杰 b8cf5c7cfe byd 装配件策略 截取右侧流水 10 months ago
yxw f82c6626a1 装配目视单打印策略类字段引用修改 10 months ago
yxw f930bb092b Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw 5eaf01b076 排序展示组件查询逻辑优化 10 months ago
gsz 44f72a56a6 PCN发运单打印页面1 10 months ago
gsz ad5934cfd8 43289 SPS拉动提示系统异常 10 months ago
xiangwei.zhang a05cd762bc 条码打印次数更新 10 months ago
王杰 d379ad543e Merge branch 'dev-wuhan' into dev-wuhan-temp 10 months ago