Commit Graph

416 Commits (uat-temp-nht-2503100000-45560)

Author SHA1 Message Date
王杰 7d1d6149fc Merge remote-tracking branch 'origin/uat-temp-castle-2502241152-fordFetchWeb' into uat-temp-wj-chongqingdaqu-prod 7 months ago
logic.fang ca85a6f637 Merge remote-tracking branch 'refs/remotes/origin/uat-temp-logic-20250307-45527' into uat-temp-wj-chongqingdaqu-prod
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesPartShippingGroupService.java
7 months ago
王杰 9dfff1db6e Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 7 months ago
王杰 228aa76db7 推单 7 months ago
王杰 0819b960e2 排序推单 7 months ago
logic.fang a53f97b8a0 45527 礼嘉福特发运单打印 7 months ago
王杰 ef30d1db83 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 7 months ago
王杰 7b5ffeb7d4 推单 7 months ago
castle.zang 0ed0d4e43f 福特抓取网页 7 months ago
王杰 e6e061967b 重庆大区 7 months ago
castle.zang 8d7fed8bbc 福特抓取网页 7 months ago
王杰 8ca9f3fad1 排序推单 8 months ago
王杰 a9cb79ff8b 排序推单 8 months ago
王杰 1db013d028 合并44424解决冲突 8 months ago
王杰 cae8f9af41 排序推单 8 months ago
jason 17b7c10a7a 重新提交自定义打印功能,用于合并test 8 months ago
王杰 14dba4b720 排序推单 8 months ago
王杰 933eef1adb 排序推单 8 months ago
王杰 96e5b5ca58 不可用规则, 排序线 工位设备一对多关系, 代码对应调整 8 months ago
王杰 a6c556fd17 排序推单 8 months ago
王杰 863ef779fe Merge remote-tracking branch 'origin/uat-temp-castle-250209-kitting' into test 8 months ago
王杰 9774e051f1 合并45028 批量手动报工页面增加“过账日期”选择条件 解决冲突 8 months ago
王杰 11348964e4 45151 PCN:电子化检验操作会突然退出登录 8 months ago
王杰 6948872ca3 批次防错:不可用规则 作用于菜单功能中的换件 8 months ago
王杰 28078b3a74 45028 批量手动报工页面增加“过账日期”选择条件 - 二次修改, 发现了其他代码BUG: 超工单情况下改工单状态完成 不生效; 超工单报错情况下会偶发缓存问题导致篡改DB的工单信息 8 months ago
王杰 4721c5e1ba 批次防错 8 months ago
王杰 4241dcd230 shipping rfid 8 months ago
castle.zang 4102d444db 深汕kitting 8 months ago
王杰 c06eb67236 根据读取条码生成条码;保存条码与工单对应关系;装配件获取匹配工单 三个工步 第一版提交 8 months ago
王杰 3967b7acfd merge 红外焊超差预警 解决冲突 8 months ago
王杰 1a5c2272e7 红外焊超差预警 8 months ago
xiangwei.zhang 4fb5c3d50b 44881 MES:裁片补片逻辑更新&裁片报表 8 months ago
王杰 dca4d89330 包装补打印 9 months ago
王杰 bd4f18ed84 重庆打包 9 months ago
王杰 1f6fe5e4a0 零件打包 9 months ago
王杰 51ba9f967f Merge remote-tracking branch 'origin/uat-temp-castle-2501090929-44791' into test 9 months ago
王杰 14939ea2e5 Merge branch 'uat-temp-wj-2501090000-44517' into test 9 months ago
王杰 47e87b8fe1 44517 装箱防错后吐条码需求(芜湖) 9 months ago
castle.zang eee50bfcdf 44791 迁移线末大屏看板到 pcn 9 months ago
王杰 1edc7329f6 Merge branch 'uat-temp-wj-2412270000-44514' 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
王杰 4b9beb099d Merge branch 'uat-temp-wj-2412280000-44630' into test 10 months ago
castle.zang 86f9128348 44509 查询条码状态 10 months ago
castle.zang e992c4de6d 44635 芜湖排序发运打印 10 months ago
castle.zang b910521dc7 44509 pcn端条码报表 10 months ago
王杰 4fda271266 Merge branch 'uat-temp-castle-2412250942-44253' into test 10 months ago
王杰 75ef282bcf 44423 返工作业页面增加排序拆解按钮 merge 解决冲突 10 months ago