Commit Graph

1332 Commits (39b0a5ab247cd22e78df322fb7ad8e376aa08b34)
 

Author SHA1 Message Date
王杰 39b0a5ab24 Merge branch 'uat-temp-wj-2412300000-44653' into dev 9 months ago
王杰 ac1971ff16 Merge remote-tracking branch 'origin/uat-temp-xw-202412311219-hotfix' into dev 9 months ago
王杰 b75b23e6f0 44653 电子化检验输入数量支持小数点输入 9 months ago
xiangwei.zhang f3e7ec6eaf hotfix-报工工作中心不对 9 months ago
xiangwei.zhang 947b02ffae Merge branch 'dev-temp-xw-202412301219-44255' into dev 9 months ago
xiangwei.zhang 191704bbae 44255-优化:非排序工艺路线支持所有路线主表明细批量导入 9 months ago
xiangwei.zhang 9317426969 44255-优化:非排序工艺路线支持所有路线主表明细批量导入 9 months ago
王杰 246a7d3269 合并 44615 发运明细报表增加客户订单号、发运组名称字段模糊查询 解决冲突: 使用origin/test 分支的MesWorkOrderService/MesCreateWorkOrderImpl 覆盖到dev 9 months ago
王杰 15066f676b merge dev-temp-castle-241223-44172 解决冲突 9 months ago
王杰 fada312113 44615 发运明细报表增加客户订单号、发运组名称字段模糊查询 9 months ago
王杰 49c072cc44 44615 发运明细报表增加客户订单号、发运组名称字段模糊查询 9 months ago
castle.zang 6a90f0f54d Merge remote-tracking branch 'origin/test' into test 10 months ago
castle.zang be6816c3dd 43316 修复bomVersion启用问题 10 months ago
王杰 bdc5db8ea2 Merge branch 'test-temp-castle-2412271558-44316' into test 10 months ago
王杰 60aa5a2272 Merge branch 'test-temp-castle-2412271558-44316' into dev 10 months ago
castle.zang f5f2a4b31d 43316 修复bomVersion启用问题 10 months ago
王杰 c343f0bda6 合并 test-temp-castle-2412271558-44316 44316 排序工单BOM拆分逻辑更新 --- 解决冲突 10 months ago
王杰 62d27d7b53 Merge branch 'uat-temp-wj-2412270000-44628' into test 10 months ago
王杰 219353cde2 合并 test-temp-castle-2412271558-44316 44316 排序工单BOM拆分逻辑更新 --- 解决冲突 10 months ago
王杰 3db69d968e 合并 test-temp-castle-2412271558-44316 44316 排序工单BOM拆分逻辑更新 --- 解决冲突 10 months ago
castle.zang bc76beab75 43316 10 months ago
王杰 5856d21492 merge uat-temp-wj-2412270000-44628 解决冲突 10 months ago
王杰 6c54c40e68 44628 生产工单重新打印目视单,数据不对 10 months ago
王杰 95f55d8df7 merge dev-temp-castle-241223-44022 解决冲突 10 months ago
王杰 54adc62fdc 44316 bom是否启动bomVersion merge 解决冲突 10 months ago
王杰 ebfbe36dfa Merge branch 'uat-temp-castle-2412251631-44430' into dev 10 months ago
王杰 5601754a02 Merge branch 'uat-temp-wj-2412240000-44335' into test 10 months ago
王杰 407de709fc 44022 芜湖正式:产线看板,需要关联显示异常停线时间 merge 解决冲突 10 months ago
王杰 e11a9e7ffc Merge branch 'uat-temp-wj-20241223-44377' into test 10 months ago
王杰 4bd1ea7aac Merge branch 'dev-temp-castle-2412191445-44381' into test 10 months ago
王杰 4ca5148569 merge 44316 bom是否启动bomVersion 解决冲突 10 months ago
王杰 d6749ca871 merge 44316 bom是否启动bomVersion 解决冲突 10 months ago
王杰 2469dba755 Merge branch 'dev-temp-xw-202412261219-44576' into test 10 months ago
xiangwei.zhang a774301a9a 44576 BTO工单看板查询
44510 bom失效查询问题
10 months ago
castle.zang 549e8023f5 43316 10 months ago
castle.zang 8074411c3c 43316 10 months ago
xiangwei.zhang ffa70f634e bom信息查询失效时间修改 10 months ago
castle.zang 559a1c456a 43316 10 months ago
xiangwei.zhang efa93153a5 bom信息查询失效时间修改 10 months ago
castle.zang ed761df83d 需求 44430 待开票业务方案 10 months ago
王杰 97703e2960 Merge branch 'uat-temp-wj-2412240000-44335' into dev 10 months ago
王杰 f824ce25ee 44335 非排序加工规则页面,在“设备代码”列后增加“设备名称”列 10 months ago
王杰 8e6ea7bd53 Merge branch 'uat-temp-wj-20241223-44377' into dev 10 months ago
王杰 b2fec000c5 44377 检验产品数据总报表目前是动态表单配置查询很慢,需要重新开发 10 months ago
王杰 6c83b4cefb Merge branch 'uat-temp-wj-20241223-44377' into dev 10 months ago
王杰 955a5c8d8b 44377 检验产品数据总报表目前是动态表单配置查询很慢,需要重新开发 10 months ago
castle.zang 144edb05ad Merge branch 'dev-temp-castle-241223-44172' of https://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 10 months ago
castle.zang 74aa08e9ee Merge branch 'dev-temp-castle-241223-44022' of https://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 10 months ago
castle.zang 2be5ccc1e4 fix bug PC-发运明细报表:增加vin和条码的查询条件-44172 10 months ago
castle.zang e53ddfa6ef fix bug 44022 芜湖正式:产线看板,需要关联显示异常停线时间 10 months ago