Commit Graph

1690 Commits (db21e3895984e3ddb3a1a92d596fafd1a3da9b78)
 

Author SHA1 Message Date
王杰 db21e38959 Merge branch 'uat-temp-wj-250208-44424' into test 3 months ago
王杰 653e9f192b Merge remote-tracking branch 'origin/uat-temp-nht-202502260000-customprint' into test 3 months ago
jason 17b7c10a7a 重新提交自定义打印功能,用于合并test 3 months ago
王杰 2ed8052a73 Merge remote-tracking branch 'origin/test-demp-ljs-202501181621-44904' into test 3 months ago
王杰 734b6642ba Merge branch 'test-temp-wj-2501170000-44435' into test 3 months ago
臧学普 9953e8a9ac Merge remote-tracking branch 'origin/uat' into uat 3 months ago
王杰 39bbfb44fe Merge branch 'test' into uat 3 months ago
王杰 863ef779fe Merge remote-tracking branch 'origin/uat-temp-castle-250209-kitting' into test 3 months ago
王杰 9548dc2a5b 合并工单类 冲突 3 months ago
王杰 fdba01de69 裁片包装模版维护 报错提示信息修改 3 months ago
王杰 26b923b3ca 合并 45034 45035 解决冲突 3 months ago
王杰 9774e051f1 合并45028 批量手动报工页面增加“过账日期”选择条件 解决冲突 3 months ago
王杰 08aa170d99 同步dev 工单类 因为存在冲突 3 months ago
王杰 28078b3a74 45028 批量手动报工页面增加“过账日期”选择条件 - 二次修改, 发现了其他代码BUG: 超工单情况下改工单状态完成 不生效; 超工单报错情况下会偶发缓存问题导致篡改DB的工单信息 3 months ago
王杰 f21eb3380c 44435 PCN:排序下线条码打印配置follow Pisces 3 months ago
王杰 62683d21c4 Merge branch 'test' into uat 3 months ago
王杰 3a2a5a8e1b Merge remote-tracking branch 'origin/dev-temp-xw-202501150000-44838' into test 3 months ago
王杰 383f8b3886 Merge branch 'test' into uat 3 months ago
王杰 3fed32bc15 revert 57d8fbab91
revert 45028 批量手动报工页面增加“过账日期”选择条件
3 months ago
臧学普 7afdc57541 Merge remote-tracking branch 'origin/uat' into uat 3 months ago
臧学普 dd0cf7f1b1 修复bug 44248 https图片问题 3 months ago
Janson 57d8fbab91 45028 批量手动报工页面增加“过账日期”选择条件 3 months ago
xiangwei.zhang 8612803152 45034 PCN:排序报工数据边端汇报了,云端显示未汇报
45035   PCN:前一天汇总报工job,日志提示错误后,没有将错误原因放在加工记录表备注列
3 months ago
臧学普 4102d444db 深汕kitting 3 months ago
王杰 c9dc4b42d2 合并44881 MES:裁片补片逻辑更新 解决冲突 3 months ago
王杰 75d1df7604 Merge remote-tracking branch 'origin/dev-temp-xw-202502050000-44881' into test 3 months ago
xiangwei.zhang ef2c01cbed 44881 MES:裁片补片逻辑更新&裁片报表 3 months ago
王杰 523bc9810c Merge remote-tracking branch 'origin/dev-temp-xw-202502050000-44881' into test 3 months ago
xiangwei.zhang b10add6bc4 44881 MES:裁片补片逻辑更新&裁片报表 3 months ago
王杰 d7954e5961 Merge remote-tracking branch 'origin/dev-temp-xw-202502050000-44881' into test 3 months ago
王杰 7c94176cda Merge branch 'uat-temp-wj-250210-45015' into test 3 months ago
王杰 21f0ed4b6c 45015 MES:SPS单据打印,拉动单上面按照库位地址升序 3 months ago
王杰 6c6bd255f5 Merge remote-tracking branch 'origin/dev-temp-nht-202501160000-44744' into test 3 months ago
王杰 3b391c1019 44424 PCN:工单判可疑的码,扫描工单检验通过后,在扫描装配件工步时扫描判可疑码,工单标记为可疑 3 months ago
王杰 b46e6a6a8a 44424 PCN:工单判可疑的码,扫描工单检验通过后,在扫描装配件工步时扫描判可疑码,工单标记为可疑 3 months ago
王杰 6f1fe719a0 44424 PCN:工单判可疑的码,扫描工单检验通过后,在扫描装配件工步时扫描判可疑码,工单标记为可疑 3 months ago
xiangwei.zhang 4fb5c3d50b 44881 MES:裁片补片逻辑更新&裁片报表 3 months ago
xiangwei.zhang 4e543f517f 44863 PCN-零件生产组增加“禁用Bom版本号”开关最终确认版逻辑优化 4 months ago
王杰 548ba84f08 44937 PCN:批量手动报工页面,排序方式按照工单号升序 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
王杰 a7b4f79a5f Merge branch 'test-temp-wj-2501170000-00000' into test 4 months ago
王杰 6d4ed9fe69 44887 离线数据回传问题修复 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 15c86109d5 44896 生产汇报边端同步云端问题修复 4 months ago
王杰 6892759782 44435 PCN:排序下线条码打印配置follow Pisces 4 months ago
xiangwei.zhang 2acd70ca6a 44873 PCN-批量报工页面,工单展示顺序基于工单序号正序排列显示
44883 MES:PCN-批量报工,写入报工表中未写入bom_code
4 months ago
王杰 5349353ca8 44887 离线数据回传问题修复 4 months ago