Commit Graph

331 Commits (3d02c9b4a992273f97b76e4c5064cd3f43870692)

Author SHA1 Message Date
xiangwei.zhang 3d02c9b4a9 Merge branch 'dev_temp_xw_20250305_45455' into dev 2 months ago
xiangwei.zhang 4af1337a7f 45455 裁片生产过程控制,产品加工记录数量保存数据不对 2 months ago
王杰 12f0aabdce Merge remote-tracking branch 'origin/uat-temp-xw-202501200000-44905' into test 2 months ago
王杰 3de53d476a Merge remote-tracking branch 'origin/uat-temp-castle-2502071033-kitting' into test 3 months ago
王杰 f41716f70a Merge remote-tracking branch 'origin/uat-temp-nht-2502060000-44953' into test 3 months ago
jason 5beca74961 Merge remote-tracking branch 'origin/uat-temp-xw-202501200000-44905' into dev 3 months ago
jason 078f86e8d3 新增cockpit发运处理功能 3 months ago
臧学普 069026f093 Merge branch 'uat-temp-castle-2502071033-kitting' into dev 3 months ago
臧学普 4a84cba207 kitting 修复 3 months ago
王杰 7470ab94bf Merge remote-tracking branch 'origin/uat-temp-nht-2502100000-45019' into dev 3 months ago
王杰 8600e15fe6 Merge remote-tracking branch 'origin/uat-temp-castle-2502070911-44952' into test 3 months ago
Janson 6b82f97b73 45019 新增不可用规则维护功能 3 months ago
王杰 0b61c7a143 Merge remote-tracking branch 'origin/dev-temp-xw-202501150000-44838' into test 3 months ago
Janson 00a33f9bde Merge remote-tracking branch 'origin/uat-temp-nht-2502060000-44953' into dev 3 months ago
Janson 3ff9564b61 44953 新增条码打印模板的字段支持自定义配置 3 months ago
臧学普 29b78d3385 Merge branch 'uat-temp-castle-2502070911-44952' into dev 3 months ago
臧学普 deff0ac43b fix bug 44952 MES-零件生产组明细、零件发运组明细、客户车型配置明细输入客户零件号后将零件号带出来 3 months ago
王杰 4cf0a5a7b9 Merge branch 'test-temp-wj-250117-pack' into dev 4 months ago
xiangwei.zhang c3abf292e1 Merge branch 'uat-temp-xw-202501200000-44905' into dev 4 months ago
xiangwei.zhang a4d6e8009a 44905 MES-发运异常处理 4 months ago
xiangwei.zhang 6b5432d5b9 Merge branch 'uat-temp-xw-202501200000-44905' into dev 4 months ago
xiangwei.zhang be1749fb92 44905 MES-发运异常处理 4 months ago
xiangwei.zhang 08301bc9a2 44905 MES-发运异常处理 4 months ago
王杰 ec7f396e33 重庆打包 4 months ago
xiangwei.zhang 45c7fe23da Merge branch 'dev-temp-ljs-202501091824-44656' into dev 4 months ago
王杰 bf114910e2 Merge branch 'uat-temp-wj-2501090000-44517' into test 4 months ago
xiangwei.zhang 973ff08b91 Merge branch 'dev-temp-xw-202501150000-44838' into dev 4 months ago
xiangwei.zhang 338dd627ca 44838 MES:裁片补片逻辑更新&裁片报表 4 months ago
xiangwei.zhang 1815794e04 Merge branch 'dev-temp-xw-202501150000-44838' into dev 4 months ago
xiangwei.zhang 10131f750e 44838 MES:裁片补片逻辑更新&裁片报表 4 months ago
jun f08ab29045 44656 报工调整报表中原因为空 提示信息错误 4 months ago
王杰 8c6178ffbb Merge branch 'uat-temp-wj-2501090000-44517' into dev 4 months ago
王杰 7a2d89eda0 44517 装箱防错后吐条码需求(芜湖) 4 months ago
xiangwei.zhang 40d041a3cd 44670 PC: 模板导入时报错问题 4 months ago
王杰 c343f0bda6 合并 test-temp-castle-2412271558-44316 44316 排序工单BOM拆分逻辑更新 --- 解决冲突 4 months ago
王杰 3db69d968e 合并 test-temp-castle-2412271558-44316 44316 排序工单BOM拆分逻辑更新 --- 解决冲突 4 months ago
臧学普 bc76beab75 43316 4 months ago
王杰 e11a9e7ffc Merge branch 'uat-temp-wj-20241223-44377' into test 4 months ago
王杰 4bd1ea7aac Merge branch 'dev-temp-castle-2412191445-44381' into test 4 months ago
王杰 4ca5148569 merge 44316 bom是否启动bomVersion 解决冲突 4 months ago
王杰 6c83b4cefb Merge branch 'uat-temp-wj-20241223-44377' into dev 5 months ago
王杰 b6aa88449d 44377 检验产品数据总报表目前是动态表单配置查询很慢,需要重新开发 5 months ago
王杰 d7ceca9535 Merge branch 'uat-temp-wj-20241223-44377' into dev 5 months ago
王杰 adb0cf7a8b 44376 武汉 加工记录统计报表 需求变更 5 months ago
王杰 3a3bfc3c6c Merge branch 'dev-temp-castle-2412191445-44381' into dev 5 months ago
王杰 17fb826dd7 merge dev-temp-castle-2412131528-44316 解决冲突 5 months ago
臧学普 e1a6521c00 通用客户CBR 5 months ago
王杰 2f388460cc 加工记录统计报表 5 months ago
臧学普 ef0e52289b POM逻辑修改 5 months ago
jun 99c87bd8bc Merge remote-tracking branch 'origin/dev' into dev 5 months ago